Changeset 1753 for trunk/eraser6

Timestamp:

2/8/2010 1:24:57 AM (2 years ago)

Author:

lowjoel

Message:

Forward port from Eraser 6.0: Fixed crash when importing a corrupt/outdated task list.

Location:

trunk/eraser6

Files:

• . (modified) (1 prop)
• Eraser/MainForm.cs (modified) (2 diffs)

trunk/eraser6/Eraser/MainForm.cs

@@ -34 +34 @@
 using System.Diagnostics;
 using System.Reflection;
+using System.Runtime.Serialization;
 
 namespace Eraser
@@ -258 +259 @@
                         FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
                     {
-                        Program.eraserClient.Tasks.LoadFromStream(stream);
+                        try
+                        {
+                            Program.eraserClient.Tasks.LoadFromStream(stream);
+                        }
+                        catch (FileLoadException ex)
+                        {
+                            MessageBox.Show(S._("The task list could not be imported. The error " +
+                                "returned was: {0}", ex.Message), S._("Eraser"),
+                                MessageBoxButtons.OK, MessageBoxIcon.Error,
+                                MessageBoxDefaultButton.Button1,
+                                S.IsRightToLeft(null) ? MessageBoxOptions.RtlReading : 0);
+                        }
+                        catch (SerializationException ex)
+                        {
+                            MessageBox.Show(S._("The task list could not be imported. The error " +
+                                "returned was: {0}", ex.Message), S._("Eraser"),
+                                MessageBoxButtons.OK, MessageBoxIcon.Error,
+                                MessageBoxDefaultButton.Button1,
+                                S.IsRightToLeft(null) ? MessageBoxOptions.RtlReading : 0);
+                        }
                     }
                 }