0.1.0.3

- Quick fix to the updater to get it working properly
LogicAndTrick · Jul 27, 2013 · 67e490f · 67e490f
1 parent 9978c62
commit 67e490f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/Sledge.Editor.Updater/UpdaterForm.cs b/Sledge.Editor.Updater/UpdaterForm.cs
@@ -4,6 +4,7 @@
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
@@ -83,6 +84,13 @@ private void DoUpdate()
                                                   Application.Exit();
                                               });
                     }
+                    else
+                    {
+                        InstallUpdate(directory, download);
+                        Directory.Delete(updateDirectory, true);
+                        Process.Start(Path.Combine(directory, "Sledge.Editor.exe"));
+                        Application.Exit();
+                    }
                     return;
                 }
             }
@@ -169,13 +177,19 @@ private void UpdateProgress(object sender, DownloadProgressChangedEventArgs e)
 
         private void InstallUpdate(string installDir, string file)
         {
-            StatusLabel.Text = "Installing update...";
+            StatusLabel.BeginInvoke((Action) (() =>
+                                                  {
+                                                      StatusLabel.Text = "Installing update...";
+                                                  }));
             // File is already in a folder at this point.
             var updateDir = Path.GetDirectoryName(file);
             if (updateDir == null) return;
 
             UnZip(file); // Extract in-place
             File.Delete(file); // Delete archive
+            // Delete currently used files
+            File.Delete(Path.Combine(updateDir, "ICSharpCode.SharpZipLib.dll"));
+            File.Delete(Path.Combine(updateDir, "Sledge.Editor.Updater.exe"));
             InstallDirectory(installDir, updateDir); // Move all files across
         }
 

diff --git a/Sledge.Editor/Editor.cs b/Sledge.Editor/Editor.cs
@@ -25,7 +25,6 @@
 using Sledge.Settings;
 using Sledge.Settings.Models;
 using Hotkeys = Sledge.Editor.UI.Hotkeys;
-using Path = Sledge.DataStructures.MapObjects.Path;
 
 namespace Sledge.Editor
 {

diff --git a/Sledge.Editor/Properties/AssemblyInfo.cs b/Sledge.Editor/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.1.0.2")]
-[assembly: AssemblyFileVersion("0.1.0.2")]
+[assembly: AssemblyVersion("0.1.0.3")]
+[assembly: AssemblyFileVersion("0.1.0.3")]