Changeset 2439 for trunk

Timestamp:

10/19/09 15:11:36 (15 years ago)

Author:

abeham

Message:

wrapping close method to possibly solve #183

Location:

trunk/sources/HeuristicLab

Files:

• SplashScreen.Designer.cs (modified) (1 diff)
• SplashScreen.cs (modified) (2 diffs)

trunk/sources/HeuristicLab/SplashScreen.Designer.cs

@@ -214 +214 @@
       this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
       this.TopMost = true;
-      this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.SplashScreen_FormClosing);
       this.panel.ResumeLayout(false);
       ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();

trunk/sources/HeuristicLab/SplashScreen.cs

@@ -102 +102 @@
       }
       SetInfoText(info);
-      Application.DoEvents();
     }
 
@@ -126 +125 @@
         } else {
           Opacity = 0;
-          Close();
+          CloseSplashScreen();
         }
       }
     }
 
-    private void SplashScreen_FormClosing(object sender, FormClosingEventArgs e) {
-      PluginManager.Manager.Action -= new PluginManagerActionEventHandler(this.Manager_Action);
+    private void closeButton_Click(object sender, EventArgs e) {
+      lock(bigLock) {
+        if(fadeTimer != null) fadeTimer.Stop();
+        CloseSplashScreen();
+      }
     }
 
-    private void closeButton_Click(object sender, EventArgs e) {
-      lock(bigLock) {
+    private void CloseSplashScreen() {
+      if (!closing) { // just close once
         closing = true;
-        if(fadeTimer != null) fadeTimer.Stop();
-        Close();
+        PluginManager.Manager.Action -= new PluginManagerActionEventHandler(this.Manager_Action); // remove event before calling close
+        Application.DoEvents(); // work up all existing events
+        Close(); // close
       }
     }