Changeset 1392 for trunk

Timestamp:

03/21/09 16:28:40 (16 years ago)

Author:

gkronber

Message:

Fixed #530 (Service applications are restarted again and again even when the user terminates the starter)

Location:

trunk/sources/HeuristicLab

Files:

• MainForm.Designer.cs (modified) (1 diff)
• MainForm.cs (modified) (4 diffs)

trunk/sources/HeuristicLab/MainForm.Designer.cs

@@ -178 +178 @@
       this.Name = "MainForm";
       this.Text = "HeuristicLab Starter";
+      this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing);
       this.ResumeLayout(false);
       this.PerformLayout();

trunk/sources/HeuristicLab/MainForm.cs

@@ -36 +36 @@
 
     private ListViewItem pluginManagerListViewItem;
+    private bool abortRequested;
 
     public MainForm() {
+      abortRequested = false;
       SplashScreen splashScreen = new SplashScreen(1000, "Loading HeuristicLab...");
       splashScreen.Owner = this;
@@ -97 +99 @@
             do {
               try {
-                PluginManager.Manager.Run(app);
+                if(!abortRequested) 
+                  PluginManager.Manager.Run(app);
                 stopped = true;
               } catch(Exception ex) {
@@ -104 +107 @@
                 Thread.Sleep(5000); // sleep 5 seconds before autorestart
               }
-            } while(!stopped && app.AutoRestart);
+            } while(!abortRequested && !stopped && app.AutoRestart);
           });
           t.SetApartmentState(ApartmentState.STA); // needed for the AdvancedOptimizationFrontent
@@ -148 +151 @@
       return sb.ToString();
     }
+
+    private void MainForm_FormClosing(object sender, FormClosingEventArgs e) {
+      abortRequested = true;
+    }
   }
 }