Fix a bug where directory of the old version is not deleted after upd…

…ate.
JetStream96 · Feb 14, 2017 · 7f1facb · 7f1facb
1 parent d0210aa
commit 7f1facb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/src/QSP/Program.cs b/src/QSP/Program.cs
@@ -9,7 +9,6 @@
 using System.Drawing;
 using System.Globalization;
 using System.IO;
-using System.Linq;
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Windows.Forms;
@@ -141,16 +140,10 @@ private static void StartLauncher()
 
         private static void SetExceptionHandler()
         {
-            AppDomain.CurrentDomain.UnhandledException += (sender, e) =>
-            {
+            AppDomain.CurrentDomain.UnhandledException += (s, e) =>
                 HandleException((Exception)e.ExceptionObject);
-            };
-
-            Application.ThreadException += (sender, e) =>
-            {
-                HandleException(e.Exception);
-            };
 
+            Application.ThreadException += (s, e) => HandleException(e.Exception);
             Application.SetUnhandledExceptionMode(UnhandledExceptionMode.CatchException);
         }
 

diff --git a/src/QSP/Updates/Updater.cs b/src/QSP/Updates/Updater.cs
@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Net;
 using System.Xml.Linq;
+using QSP.LibraryExtension.XmlSerialization;
 using static QSP.Utilities.LoggerInstance;
 using static QSP.Utilities.ExceptionHelpers;
 using static QSP.Updates.Utilities;
@@ -148,8 +149,11 @@ private static void UpdateXmlAndDeleteOldVersion(string version)
         {
             var doc = GetVersionXDoc();
             var root = doc.Root;
-            var backup = root.Element("current").Value;
-            IgnoreException(() => Directory.Delete(root.Element("backup").Value));
+            var backup = root.GetString("current");
+
+            var oldBackup = root.GetString("backup");
+            if (oldBackup != "") Directory.Delete(Path.Combine("..", oldBackup), true);
+
             root.Element("current").Value = version;
             root.Element("backup").Value = backup;
             File.WriteAllText(VersionXmlPath, doc.ToString());