Changeset 4765 for extensions/pLoader/trunk

Timestamp:

Jan 27, 2010, 6:47:56 PM (14 years ago)

Author:

ronosman

Message:

Bug 1410 : pLoader may crash when adding or uploading photo is canceled. Fix dialog box crash on Ubuntu 8 caused by dialog destroy.

Location:

extensions/pLoader/trunk/src/Uploader/GUI

Files:

• Frame.pm (modified) (3 diffs)
• wxImageProcessingProgressDlg.pm (modified) (1 diff)

extensions/pLoader/trunk/src/Uploader/GUI/Frame.pm

@@ -1296 +1296 @@
 
     $self->ShowImageViewer();
+    
+    $self->progressdlg->Destroy if defined $self->progressdlg;
     $self->progressdlg( 
         Uploader::GUI::wxImageProcessingProgressDlg->new(
@@ -1747 +1749 @@
         return if( !scalar @{$self->imagelist->image_selection} );
         
+        $self->upload_progressdlg->Destroy if defined $self->upload_progressdlg;
         $self->upload_progressdlg(
             Uploader::GUI::wxImageProcessingProgressDlg->new(
@@ -1850 +1853 @@
     $self->getting_started->Destroy;
 
-    $self->Destroy;
-
+    $self->progressdlg->Destroy if defined $self->progressdlg;
+    $self->upload_progressdlg->Destroy if defined $self->upload_progressdlg;
 
     $self->Destroy;

extensions/pLoader/trunk/src/Uploader/GUI/wxImageProcessingProgressDlg.pm

@@ -154 +154 @@
     $self->cancelled(1);
     $self->stop_processing->();
-    $self->Destroy;
+    $self->Hide;
  
 }