fix potential error, add error dialog

Maassoft · Nov 22, 2020 · d00595f · d00595f
1 parent da5b760
commit d00595f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/ColorControl/ColorControl.csproj b/ColorControl/ColorControl.csproj
@@ -27,7 +27,7 @@
     <ProductName>ColorControl</ProductName>
     <PublisherName>Maassoft</PublisherName>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.3.0.0</ApplicationVersion>
+    <ApplicationVersion>1.3.1.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>

diff --git a/ColorControl/LgService.cs b/ColorControl/LgService.cs
@@ -112,7 +112,7 @@ private void SetDevicesTask(Task<List<PnpDev>> task)
             Devices = task.Result;
             if (Devices?.Count > 0)
             {
-                var preferredDevice = Devices.FirstOrDefault(x => x.MacAddress.Equals(Config.PreferredMacAddress)) ?? Devices[0];
+                var preferredDevice = Devices.FirstOrDefault(x => x.MacAddress != null && x.MacAddress.Equals(Config.PreferredMacAddress)) ?? Devices[0];
 
                 SelectedDevice = preferredDevice;
             }

diff --git a/ColorControl/MainForm.cs b/ColorControl/MainForm.cs
@@ -193,7 +193,7 @@ public MainForm(StartUpParams startUpParams)
 
             if (_lgService != null)
             {
-                SystemEvents.SessionEnded += new SessionEndedEventHandler(SessionEnded);
+                //SystemEvents.SessionEnded += new SessionEndedEventHandler(SessionEnded);
                 SystemEvents.PowerModeChanged += new PowerModeChangedEventHandler(PowerModeChanged);
             }
 

diff --git a/ColorControl/Program.cs b/ColorControl/Program.cs
@@ -31,9 +31,16 @@ static void Main(string[] args)
                 }
                 else
                 {
-                    Application.EnableVisualStyles();
-                    Application.SetCompatibleTextRenderingDefault(false);
-                    Application.Run(new MainForm(startUpParams));
+                    try
+                    {
+                        Application.EnableVisualStyles();
+                        Application.SetCompatibleTextRenderingDefault(false);
+                        Application.Run(new MainForm(startUpParams));
+                    }
+                    catch (Exception ex)
+                    {
+                        MessageBox.Show("Error while initializing application: " + ex.ToLogString(Environment.StackTrace), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    }
                 }
             }
             finally

diff --git a/ColorControl/Properties/AssemblyInfo.cs b/ColorControl/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("1.3.0.0")]
-[assembly: AssemblyFileVersion("1.3.0.0")]
+[assembly: AssemblyVersion("1.3.1.0")]
+[assembly: AssemblyFileVersion("1.3.1.0")]