include changes from master #43

Merged
fyr77 merged 3 commits from master into feature-autodownload 2024-02-26 19:03:18 +01:00
3 changed files with 13 additions and 6 deletions

View file

@ -6,9 +6,16 @@ namespace EnvyUpdate
{ {
public static void ShowDrivUpdatePopup() public static void ShowDrivUpdatePopup()
{ {
var toast = new ToastContentBuilder(); try
toast.AddText(Properties.Resources.update_popup_message); {
toast.Show(); 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);
}
} }
} }
} }

View file

@ -49,5 +49,5 @@ using System.Windows;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.4")] [assembly: AssemblyVersion("3.5")]
[assembly: AssemblyFileVersion("3.4")] [assembly: AssemblyFileVersion("3.5")]

View file

@ -337,7 +337,7 @@ namespace EnvyUpdate
{ {
GPUName = obj["VideoProcessor"].ToString().ToLower(); GPUName = obj["VideoProcessor"].ToString().ToLower();
// Remove any 3GB, 6GB or similar from name. We don't need to know the VRAM to get results. // 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 else
GPUName = obj["VideoProcessor"].ToString(); GPUName = obj["VideoProcessor"].ToString();