Changeset 1719 for branches/eraser6/6.0/Eraser/Program.cs

Timestamp:

1/29/2010 12:40:49 AM (2 years ago)

Author:

lowjoel

Message:

Backported changes from trunk.

r1718: Author: lowjoel: When we have problems starting Eraser from the shell extension check the return code for ERROR_ELEVATION_REQUIRED; if we get that, then we should re-run the operation as an administrator.
r1717: Author: lowjoel: If the directory we are deleting does not exist, we should just return -- there's nothing to be deleted.
r1716: Author: lowjoel: Catch IOExceptions when we try to connect to other running instances and show a error message when one occurs.
r1715: Author: lowjoel: Set that files are not meant to be indexed when it is meant for deletion before we even set the file times.
r1714: Author: lowjoel: Fixed race condition potentially created by initialising the remote executor server thread immediately upon construction since Run is not yet called.
r1713: Author: lowjoel: Since we only force the creation of the SchedulerPanel?'s handle in the constructor, InvokeRequired? should be called on the panel itself, and not on subcontrols as they are still delay-constructed. Fixes crash when Eraser is started quietly and a task is created remotely.
r1712: Author: lowjoel: ThreadAbortExceptions? should not trigger BlackBox? report creation.

Location:

branches/eraser6/6.0

Files:

• . (modified) (1 prop)
• Eraser/Program.cs (modified) (1 diff)

branches/eraser6/6.0/Eraser/Program.cs

@@ -392 +392 @@
                         MessageBoxIcon.Information, MessageBoxDefaultButton.Button1,
                         S.IsRightToLeft(null) ? MessageBoxOptions.RtlReading : 0);
+                }
+                catch (IOException ex)
+                {
+                    MessageBox.Show(S._("Another instance of Eraser is already running but " +
+                        "cannot be connected to.\n\nThe error returned was: {0}", ex.Message,
+                        S._("Eraser"), MessageBoxButtons.OK, MessageBoxIcon.Error,
+                        MessageBoxDefaultButton.Button1,
+                        S.IsRightToLeft(null) ? MessageBoxOptions.RtlReading : 0));
                 }
                 catch (TimeoutException)