Merge pull request #12 from dimojang/crash_handling

dimojang · web-flow · commit 7a71e967b539 · 2021-04-03T10:39:47.000+08:00
bugs fixed
diff --git a/App.xaml.cs b/App.xaml.cs
@@ -107,18 +107,20 @@ private void CurrentDomain_ProcessExit(object sender, EventArgs e)
 
         void Current_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
         {
-            MessageBox.Show(LanguageHelper.InquireLocalizedWord("System_ExcptionInfo") + e.Exception.Message, 
+            MessageBox.Show(LanguageHelper.InquireLocalizedWord("System_ExcptionInfo") + e.Exception.Message + sender.ToString(), 
                 LanguageHelper.InquireLocalizedWord("TaskBar_AppName"), 
                 MessageBoxButton.OK, 
                 MessageBoxImage.Error);
         }
 
         void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
         {
-            MessageBox.Show(LanguageHelper.InquireLocalizedWord("System_ExcptionInfo") + e.ToString(),
+            MessageBox.Show(LanguageHelper.InquireLocalizedWord("System_ExcptionInfo") + e.ToString() + sender.ToString(),
                 LanguageHelper.InquireLocalizedWord("TaskBar_AppName"),
                 MessageBoxButton.OK,
                 MessageBoxImage.Error);
+
+            Environment.Exit(1);
         }
 
         private void SystemEvents_SessionEnded(object sender, SessionEndedEventArgs e)
diff --git a/Classes/MyDay.cs b/Classes/MyDay.cs
@@ -32,7 +32,7 @@ public class MyDay
         /// <returns>&#20170;&#26085;&#23567;&#32467; - Dictionary<string, TimeSpan></returns>
         public Dictionary<string, Software> GetOverView()
         {
-            List<MyTimeDuration> myTimeDurations = TimeLine;
+            List<MyTimeDuration> myTimeDurations = new List<MyTimeDuration>(TimeLine.ToArray());
             Dictionary<string, Software> overView = new Dictionary<string, Software>();
 
             foreach (MyTimeDuration item in myTimeDurations)

Original file line number	Diff line number	Diff line change
`@@ -107,18 +107,20 @@ private void CurrentDomain_ProcessExit(object sender, EventArgs e)`
`107`	`107`
`108`	`108`	`void Current_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)`
`109`	`109`	`{`
`110`		`- MessageBox.Show(LanguageHelper.InquireLocalizedWord("System_ExcptionInfo") + e.Exception.Message,`
	`110`	`+ MessageBox.Show(LanguageHelper.InquireLocalizedWord("System_ExcptionInfo") + e.Exception.Message + sender.ToString(),`
`111`	`111`	`LanguageHelper.InquireLocalizedWord("TaskBar_AppName"),`
`112`	`112`	`MessageBoxButton.OK,`
`113`	`113`	`MessageBoxImage.Error);`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)`
`117`	`117`	`{`
`118`		`- MessageBox.Show(LanguageHelper.InquireLocalizedWord("System_ExcptionInfo") + e.ToString(),`
	`118`	`+ MessageBox.Show(LanguageHelper.InquireLocalizedWord("System_ExcptionInfo") + e.ToString() + sender.ToString(),`
`119`	`119`	`LanguageHelper.InquireLocalizedWord("TaskBar_AppName"),`
`120`	`120`	`MessageBoxButton.OK,`
`121`	`121`	`MessageBoxImage.Error);`
	`122`	`+`
	`123`	`+ Environment.Exit(1);`
`122`	`124`	`}`
`123`	`125`
`124`	`126`	`private void SystemEvents_SessionEnded(object sender, SessionEndedEventArgs e)`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public class MyDay`
`32`	`32`	`/// <returns>今日小结 - Dictionary<string, TimeSpan></returns>`
`33`	`33`	`public Dictionary<string, Software> GetOverView()`
`34`	`34`	`{`
`35`		`- List<MyTimeDuration> myTimeDurations = TimeLine;`
	`35`	`+ List<MyTimeDuration> myTimeDurations = new List<MyTimeDuration>(TimeLine.ToArray());`
`36`	`36`	`Dictionary<string, Software> overView = new Dictionary<string, Software>();`
`37`	`37`
`38`	`38`	`foreach (MyTimeDuration item in myTimeDurations)`