diff --git a/EnvyUpdate/DashboardPage.xaml.cs b/EnvyUpdate/DashboardPage.xaml.cs
index d43e27a..d275b3f 100644
--- a/EnvyUpdate/DashboardPage.xaml.cs
+++ b/EnvyUpdate/DashboardPage.xaml.cs
@@ -210,12 +210,6 @@ namespace EnvyUpdate
if (skippedVer != onlineDriv)
{
- if (GlobalVars.autoDownload)
- {
- Debug.LogToFile("INFO Auto-Downloading driver.");
- buttonDownload_Click(null, null);
- }
-
Debug.LogToFile("INFO Showing update popup notification.");
Notify.ShowDrivUpdatePopup();
}
diff --git a/EnvyUpdate/GlobalVars.cs b/EnvyUpdate/GlobalVars.cs
index b56e851..e830039 100644
--- a/EnvyUpdate/GlobalVars.cs
+++ b/EnvyUpdate/GlobalVars.cs
@@ -19,6 +19,5 @@ namespace EnvyUpdate
public static readonly string useragent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:115.0) Gecko/20100101 Firefox/115.0";
public static bool useAppdata = false;
public static bool hasWrite = true;
- public static bool autoDownload = false;
}
}
diff --git a/EnvyUpdate/Notify.cs b/EnvyUpdate/Notify.cs
index ac317c1..d889163 100644
--- a/EnvyUpdate/Notify.cs
+++ b/EnvyUpdate/Notify.cs
@@ -6,9 +6,16 @@ namespace EnvyUpdate
{
public static void ShowDrivUpdatePopup()
{
- var toast = new ToastContentBuilder();
- toast.AddText(Properties.Resources.update_popup_message);
- toast.Show();
+ try
+ {
+ var toast = new ToastContentBuilder();
+ toast.AddText(Properties.Resources.update_popup_message);
+ toast.Show();
+ }
+ catch (System.Exception ex)
+ {
+ Debug.LogToFile("WARN Could not show notification. Error: " + ex.Message);
+ }
}
}
}
\ No newline at end of file
diff --git a/EnvyUpdate/Properties/AssemblyInfo.cs b/EnvyUpdate/Properties/AssemblyInfo.cs
index 6eeb6d9..7420f2a 100644
--- a/EnvyUpdate/Properties/AssemblyInfo.cs
+++ b/EnvyUpdate/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@ using System.Windows;
// 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("3.4")]
-[assembly: AssemblyFileVersion("3.4")]
+[assembly: AssemblyVersion("3.5")]
+[assembly: AssemblyFileVersion("3.5")]
diff --git a/EnvyUpdate/Properties/Resources.Designer.cs b/EnvyUpdate/Properties/Resources.Designer.cs
index 2442daa..4f80cf9 100644
--- a/EnvyUpdate/Properties/Resources.Designer.cs
+++ b/EnvyUpdate/Properties/Resources.Designer.cs
@@ -267,15 +267,6 @@ namespace EnvyUpdate.Properties {
}
}
- ///
- /// Looks up a localized string similar to Download updates automatically.
- ///
- public static string ui_enable_autodownload {
- get {
- return ResourceManager.GetString("ui_enable_autodownload", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Enable logging to file.
///
diff --git a/EnvyUpdate/Properties/Resources.de.resx b/EnvyUpdate/Properties/Resources.de.resx
index 296e7c4..40102a4 100644
--- a/EnvyUpdate/Properties/Resources.de.resx
+++ b/EnvyUpdate/Properties/Resources.de.resx
@@ -186,9 +186,6 @@
Programmdaten in AppData speichern
-
- Updates automatisch herunterladen
-
Programm-Log in Datei schreiben
diff --git a/EnvyUpdate/Properties/Resources.resx b/EnvyUpdate/Properties/Resources.resx
index 304ee61..3780249 100644
--- a/EnvyUpdate/Properties/Resources.resx
+++ b/EnvyUpdate/Properties/Resources.resx
@@ -186,9 +186,6 @@
Save files to AppData
-
- Download updates automatically
-
Enable logging to file
diff --git a/EnvyUpdate/SettingsPage.xaml b/EnvyUpdate/SettingsPage.xaml
index ab6f973..f00cd4b 100644
--- a/EnvyUpdate/SettingsPage.xaml
+++ b/EnvyUpdate/SettingsPage.xaml
@@ -35,19 +35,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
diff --git a/EnvyUpdate/SettingsPage.xaml.cs b/EnvyUpdate/SettingsPage.xaml.cs
index 6534512..35e33f1 100644
--- a/EnvyUpdate/SettingsPage.xaml.cs
+++ b/EnvyUpdate/SettingsPage.xaml.cs
@@ -91,15 +91,5 @@ namespace EnvyUpdate
Debug.LogToFile("INFO Switched to EXE directory.");
}
-
- private void chkAutodl_Checked(object sender, RoutedEventArgs e)
- {
- GlobalVars.autoDownload = true;
- }
-
- private void chkAutodl_Unchecked(object sender, RoutedEventArgs e)
- {
- GlobalVars.autoDownload = false;
- }
}
}
diff --git a/EnvyUpdate/Util.cs b/EnvyUpdate/Util.cs
index df99ebb..8a504cd 100644
--- a/EnvyUpdate/Util.cs
+++ b/EnvyUpdate/Util.cs
@@ -337,7 +337,7 @@ namespace EnvyUpdate
{
GPUName = obj["VideoProcessor"].ToString().ToLower();
// Remove any 3GB, 6GB or similar from name. We don't need to know the VRAM to get results.
- GPUName = Regex.Match(GPUName, "(geforce )((.tx )|(mx))?\\w*\\d*( ti)?").Value;
+ GPUName = Regex.Match(GPUName, "(geforce )((.t.? )|(mx ))?\\w*\\d*( ti)?").Value;
}
else
GPUName = obj["VideoProcessor"].ToString();