From 26df20827f2bf93a73d1a45ca05bb74a84158ee9 Mon Sep 17 00:00:00 2001 From: fyr77 Date: Tue, 4 Aug 2020 18:11:04 +0200 Subject: [PATCH] fix updater --- EnvyUpdate/GlobalVars.cs | 2 +- EnvyUpdate/MainWindow.xaml.cs | 8 +++++++- EnvyUpdate/Util.cs | 25 ------------------------- 3 files changed, 8 insertions(+), 27 deletions(-) diff --git a/EnvyUpdate/GlobalVars.cs b/EnvyUpdate/GlobalVars.cs index 08b83ed..ac8de7f 100644 --- a/EnvyUpdate/GlobalVars.cs +++ b/EnvyUpdate/GlobalVars.cs @@ -9,7 +9,7 @@ namespace EnvyUpdate public static readonly string exeloc = System.Reflection.Assembly.GetEntryAssembly().Location; public static readonly string exepath = Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location) + "\\"; public static readonly string startmenu = Environment.GetFolderPath(Environment.SpecialFolder.StartMenu); - public static readonly string version = "2.1"; + public static readonly string version = "2.2"; public static readonly string appdata = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\envyupdate\\"; public static readonly string startup = Environment.GetFolderPath(Environment.SpecialFolder.Startup); public static readonly string desktopOverride = exepath + "desktop.envy"; diff --git a/EnvyUpdate/MainWindow.xaml.cs b/EnvyUpdate/MainWindow.xaml.cs index df9454d..31b24c7 100644 --- a/EnvyUpdate/MainWindow.xaml.cs +++ b/EnvyUpdate/MainWindow.xaml.cs @@ -24,6 +24,12 @@ namespace EnvyUpdate InitializeComponent(); Title += " " + GlobalVars.version; + if (Util.GetNewVer() != GlobalVars.version) + { + MessageBox.Show("yes"); + } + MessageBox.Show(Util.GetNewVer()); + // Try to get command line arguments try { @@ -51,7 +57,7 @@ namespace EnvyUpdate { try { - if ((Util.GetNewVer() != GlobalVars.version) && (isDebug = false)) + if (Util.GetNewVer() != GlobalVars.version) { Util.UpdateApp(); } diff --git a/EnvyUpdate/Util.cs b/EnvyUpdate/Util.cs index ba34e5c..b60c006 100644 --- a/EnvyUpdate/Util.cs +++ b/EnvyUpdate/Util.cs @@ -16,31 +16,6 @@ namespace EnvyUpdate { internal class Util { - /// - /// Parses GPU info from a cookie file - /// - /// - /// - /// - public static int GetData(string path, string term) - { - string found = null; - string line; - using (StreamReader file = new StreamReader(path)) - { - while ((line = file.ReadLine()) != null) - { - if (line.Contains(term)) - { - found = line; - break; - } - } - } - int lastno = Convert.ToInt32(found.Split().Last()); - return lastno; - } - /// /// Gets local driver version. ///