diff --git a/Autostart/Autostart.csproj b/Autostart/Autostart.csproj index ac2b0d4..74611bd 100644 --- a/Autostart/Autostart.csproj +++ b/Autostart/Autostart.csproj @@ -13,6 +13,7 @@ {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 true + wicns.ico AnyCPU diff --git a/Update/Program.cs b/Update/Program.cs index c956ac4..384f586 100644 --- a/Update/Program.cs +++ b/Update/Program.cs @@ -7,6 +7,7 @@ namespace Update { internal class Program { + public static bool keepWindowOpen = false; public static void Main(string[] args) { Console.WriteLine("Path: " + args[0]); @@ -31,6 +32,12 @@ namespace Update File.Delete(args[3]); } + if (keepWindowOpen) + { + Console.WriteLine("Window kept open to see error message, press enter to continue"); + Console.ReadLine(); + } + } } public static class ZipArchiveHelper @@ -59,9 +66,18 @@ namespace Update if (file.Name != "") file.ExtractToFile(completeFileName, true); } - catch (Exception ex) + catch (IOException ex) { - Console.WriteLine(ex.ToString()); + if (file.FullName == "Update.exe") + { + + } + else + { + Console.WriteLine(ex.ToString()); + Console.WriteLine(file.FullName + " couldnt be overwritten, an error has occured"); + Program.keepWindowOpen = true; + } } } diff --git a/WeeXnes/Core/Globals.cs b/WeeXnes/Core/Globals.cs index bc57c35..911294a 100644 --- a/WeeXnes/Core/Globals.cs +++ b/WeeXnes/Core/Globals.cs @@ -15,7 +15,7 @@ namespace WeeXnes.Core public static string encryptionKey = "8zf5#RdyQ]$4x4_"; public static string AppDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "WeeXnes"); public static string SettingsFileName = "settings.ini"; - public static string version = "2.7.3"; + public static string version = "2.7.4"; public static bool info_isRpcRunning = false; public static bool info_RpcAutoStart; public static string apiUrl = "http://www.weexnes.com:5169/";