Changeset 1659 for branches/eraser6/6.0

Timestamp:

1/25/2010 2:35:37 AM (2 years ago)

Author:

lowjoel

Message:

When dealing with the LogForm? and the ProgressForm? classes, for events in which we wait for triggering by the task object, we should check that the form we belong to exists (i.e. not disposed) before we do anything on the form since forms which have Disposed() called will still receive events. There is a fix removed in this revision (in ProgressForm?.cs/WrapItemName) which may introduce new bugs but since this is really hard to reproduce I'll commit a blind fix and wait for more reports to come in.

Location:

branches/eraser6/6.0/Eraser

Files:

• LogForm.cs (modified) (2 diffs)
• ProgressForm.cs (modified) (3 diffs)

branches/eraser6/6.0/Eraser/LogForm.cs

@@ -77 +77 @@
         private void task_NewSession(object sender, EventArgs e)
         {
+            if (!IsHandleCreated)
+                return;
             if (InvokeRequired)
             {
@@ -88 +90 @@
         private void task_Logged(object sender, LogEventArgs e)
         {
+            if (!IsHandleCreated)
+                return;
             if (InvokeRequired)
             {

branches/eraser6/6.0/Eraser/ProgressForm.cs

@@ -61 +61 @@
         private void task_ProgressChanged(object sender, TaskProgressEventArgs e)
         {
+            if (!IsHandleCreated)
+                return;
             if (InvokeRequired)
             {
@@ -102 +104 @@
         private void task_TaskFinished(object sender, TaskEventArgs e)
         {
+            if (!IsHandleCreated)
+                return;
             if (InvokeRequired)
             {
@@ -160 +164 @@
         {
             StringBuilder result = new StringBuilder(itemName.Length);
+            using (Graphics g = item.CreateGraphics())
+            {
+                //Split the long file name into lines which fit into the width of the label
+                while (itemName.Length > 0)
+                {
+                    int chars = 0;
+                    int lines = 0;
+                    g.MeasureString(itemName, item.Font, new SizeF(item.Width - 2, 15),
+                        StringFormat.GenericDefault, out chars, out lines);
 
-            try
-            {
-                using (Graphics g = item.CreateGraphics())
-                {
-                    //Split the long file name into lines which fit into the width of the label
-                    while (itemName.Length > 0)
-                    {
-                        int chars = 0;
-                        int lines = 0;
-                        g.MeasureString(itemName, item.Font, new SizeF(item.Width - 2, 15),
-                            StringFormat.GenericDefault, out chars, out lines);
-
-                        result.AppendLine(itemName.Substring(0, chars));
-                        itemName = itemName.Remove(0, chars);
-                    }
+                    result.AppendLine(itemName.Substring(0, chars));
+                    itemName = itemName.Remove(0, chars);
                 }
-            }
-            catch (ObjectDisposedException)
-            {
-                //Called when the user closes the form and the delegate call to Invoke was queued.
             }