Changeset 791 for branches/eraser6/Eraser/Program.cs

Timestamp:

12/11/2008 1:11:55 PM (4 years ago)

Author:

lowjoel

Message:

Don't place the Eraser Executor instance in a Using block in the program initialisation code for GUI: the function is meant to be exited for the application to start running. Instead, clean up during the exit phase of the program's lifetime. This fixes a regression when moving to the single instance application model.

File:

• branches/eraser6/Eraser/Program.cs (modified) (3 diffs)

branches/eraser6/Eraser/Program.cs

@@ -149 +149 @@
         {
             GUIProgram program = (GUIProgram)sender;
-            using (eraserClient = new RemoteExecutorServer())
-            {
-                //Set our UI language
-                EraserSettings settings = new EraserSettings();
-                System.Threading.Thread.CurrentThread.CurrentUICulture =
-                    new CultureInfo(settings.Language);
-                program.SafeTopLevelCaptionFormat = S._("Eraser");
-
-                //Load the task list
-                if (settings.TaskList != null)
-                    using (MemoryStream stream = new MemoryStream(settings.TaskList))
-                        try
-                        {
-                            eraserClient.LoadTaskList(stream);
-                        }
-                        catch (Exception)
-                        {
-                            settings.TaskList = null;
-                            MessageBox.Show(S._("Could not load task list. All task entries have " +
-                                "been lost."), S._("Eraser"), MessageBoxButtons.OK,
-                                MessageBoxIcon.Error);
-                        }
-
-                //Create the main form
-                program.MainForm = new MainForm();
-                program.MainForm.CreateControl();
-                bool showMainForm = true;
-                foreach (string param in program.CommandLine)
-                {
-                    //Run tasks which are meant to be run on restart
-                    switch (param)
+            eraserClient = new RemoteExecutorServer();
+
+            //Set our UI language
+            EraserSettings settings = new EraserSettings();
+            System.Threading.Thread.CurrentThread.CurrentUICulture =
+                new CultureInfo(settings.Language);
+            program.SafeTopLevelCaptionFormat = S._("Eraser");
+
+            //Load the task list
+            if (settings.TaskList != null)
+                using (MemoryStream stream = new MemoryStream(settings.TaskList))
+                    try
                     {
-                        case "--atRestart":
-                            eraserClient.QueueRestartTasks();
-                            goto case "--quiet";
-
-                        //Hide the main form if the user specified the quiet command
-                        //line
-                        case "--quiet":
-                            showMainForm = false;
-                            break;
+                        eraserClient.LoadTaskList(stream);
                     }
-                }
-
-                //Run the eraser client.
-                eraserClient.Run();
-                return showMainForm;
-            }
+                    catch (Exception)
+                    {
+                        settings.TaskList = null;
+                        MessageBox.Show(S._("Could not load task list. All task entries have " +
+                            "been lost."), S._("Eraser"), MessageBoxButtons.OK,
+                            MessageBoxIcon.Error);
+                    }
+
+            //Create the main form
+            program.MainForm = new MainForm();
+            program.MainForm.CreateControl();
+            bool showMainForm = true;
+            foreach (string param in program.CommandLine)
+            {
+                //Run tasks which are meant to be run on restart
+                switch (param)
+                {
+                    case "--atRestart":
+                        eraserClient.QueueRestartTasks();
+                        goto case "--quiet";
+
+                    //Hide the main form if the user specified the quiet command
+                    //line
+                    case "--quiet":
+                        showMainForm = false;
+                        break;
+                }
+            }
+
+            //Run the eraser client.
+            eraserClient.Run();
+            return showMainForm;
         }
 
@@ -233 +232 @@
                 settings.TaskList = stream.ToArray();
             }
+
+            //Dispose the eraser executor instance
+            eraserClient.Dispose();
         }
 
@@ -300 +302 @@
                 finally
                 {
+                    //Since the program was initialised we must let the program clean up.
+                    OnExitInstance(this);
                     pipeServer.Abort();
                 }