fix exception handling

zrh4 · zrh4 · commit b7ca6633778f · 2019-06-18T16:14:23.000-04:00
diff --git a/CrossStitchProject/Form1.cs b/CrossStitchProject/Form1.cs
@@ -77,34 +77,27 @@ private void PreviewWorker_DoWork(object sender, System.ComponentModel.DoWorkEve
             }
             catch (Exception ex)
             {
-                e.Result = ex;
-                previewWorker.CancelAsync();
+                DisplayException("Error generating preview", ex);
             }
         }
         private void PreviewWorker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
         {
-            if (e.Cancelled)
+            previewButton.Enabled = true;
+            ShowNormalCursor();
+            if (e.Result == null) { return; }
+            var preview = (Bitmap)e.Result;
+            using (var previewForm = new Form())
             {
-                DisplayException("Error generating preview", (Exception)e.Result);
-            }
-            else
-            {
-                previewButton.Enabled = true;
-                ShowNormalCursor();
-                var preview = (Bitmap)e.Result;
-                using (var previewForm = new Form())
+                previewForm.StartPosition = FormStartPosition.CenterScreen;
+                previewForm.Width = preview.Width + 50;
+                previewForm.Height = preview.Height + 50;
+                var pb = new PictureBox
                 {
-                    previewForm.StartPosition = FormStartPosition.CenterScreen;
-                    previewForm.Width = preview.Width + 50;
-                    previewForm.Height = preview.Height + 50;
-                    var pb = new PictureBox
-                    {
-                        Dock = DockStyle.Fill,
-                        Image = preview
-                    };
-                    previewForm.Controls.Add(pb);
-                    previewForm.ShowDialog();
-                }
+                    Dock = DockStyle.Fill,
+                    Image = preview
+                };
+                previewForm.Controls.Add(pb);
+                previewForm.ShowDialog();
             }
         }
 
@@ -124,21 +117,13 @@ private void PatternWorker_DoWork(object sender, DoWorkEventArgs e)
             }
             catch (Exception ex)
             {
-                e.Result = ex;
-                patternWorker.CancelAsync();
+                DisplayException("Error generating pattern", ex);
             }
         }
         private void PatternWorker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
         {
-            if (e.Cancelled)
-            {
-                DisplayException("Error generating preview", (Exception)e.Result);
-            }
-            else
-            {
-                crossStitchButton.Enabled = true;
-                ShowNormalCursor();
-            }
+            crossStitchButton.Enabled = true;
+            ShowNormalCursor();
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -77,34 +77,27 @@ private void PreviewWorker_DoWork(object sender, System.ComponentModel.DoWorkEve`
`77`	`77`	`}`
`78`	`78`	`catch (Exception ex)`
`79`	`79`	`{`
`80`		`- e.Result = ex;`
`81`		`- previewWorker.CancelAsync();`
	`80`	`+ DisplayException("Error generating preview", ex);`
`82`	`81`	`}`
`83`	`82`	`}`
`84`	`83`	`private void PreviewWorker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)`
`85`	`84`	`{`
`86`		`- if (e.Cancelled)`
	`85`	`+ previewButton.Enabled = true;`
	`86`	`+ ShowNormalCursor();`
	`87`	`+ if (e.Result == null) { return; }`
	`88`	`+ var preview = (Bitmap)e.Result;`
	`89`	`+ using (var previewForm = new Form())`
`87`	`90`	`{`
`88`		`- DisplayException("Error generating preview", (Exception)e.Result);`
`89`		`- }`
`90`		`- else`
`91`		`- {`
`92`		`- previewButton.Enabled = true;`
`93`		`- ShowNormalCursor();`
`94`		`- var preview = (Bitmap)e.Result;`
`95`		`- using (var previewForm = new Form())`
	`91`	`+ previewForm.StartPosition = FormStartPosition.CenterScreen;`
	`92`	`+ previewForm.Width = preview.Width + 50;`
	`93`	`+ previewForm.Height = preview.Height + 50;`
	`94`	`+ var pb = new PictureBox`
`96`	`95`	`{`
`97`		`- previewForm.StartPosition = FormStartPosition.CenterScreen;`
`98`		`- previewForm.Width = preview.Width + 50;`
`99`		`- previewForm.Height = preview.Height + 50;`
`100`		`- var pb = new PictureBox`
`101`		`- {`
`102`		`- Dock = DockStyle.Fill,`
`103`		`- Image = preview`
`104`		`- };`
`105`		`- previewForm.Controls.Add(pb);`
`106`		`- previewForm.ShowDialog();`
`107`		`- }`
	`96`	`+ Dock = DockStyle.Fill,`
	`97`	`+ Image = preview`
	`98`	`+ };`
	`99`	`+ previewForm.Controls.Add(pb);`
	`100`	`+ previewForm.ShowDialog();`
`108`	`101`	`}`
`109`	`102`	`}`
`110`	`103`
`@@ -124,21 +117,13 @@ private void PatternWorker_DoWork(object sender, DoWorkEventArgs e)`
`124`	`117`	`}`
`125`	`118`	`catch (Exception ex)`
`126`	`119`	`{`
`127`		`- e.Result = ex;`
`128`		`- patternWorker.CancelAsync();`
	`120`	`+ DisplayException("Error generating pattern", ex);`
`129`	`121`	`}`
`130`	`122`	`}`
`131`	`123`	`private void PatternWorker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)`
`132`	`124`	`{`
`133`		`- if (e.Cancelled)`
`134`		`- {`
`135`		`- DisplayException("Error generating preview", (Exception)e.Result);`
`136`		`- }`
`137`		`- else`
`138`		`- {`
`139`		`- crossStitchButton.Enabled = true;`
`140`		`- ShowNormalCursor();`
`141`		`- }`
	`125`	`+ crossStitchButton.Enabled = true;`
	`126`	`+ ShowNormalCursor();`
`142`	`127`	`}`
`143`	`128`	`}`
`144`	`129`	`}`