Fix Stream Deck plugin shutdown to be more graceful

Fix build break due to logger.
SaviorXTanren · Mar 8, 2019 · 00540b4 · 00540b4
1 parent 22d72cf
commit 00540b4
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 25 deletions.
diff --git a/MixItUp.StreamDeckPlugin/MixItUpPlugin.cs b/MixItUp.StreamDeckPlugin/MixItUpPlugin.cs
@@ -40,33 +40,40 @@ static MixItUpPlugin()
 
         public async Task RunAsync(int port, string uuid, string registerEvent)
         {
-            this.connection = new StreamDeckConnection(port, uuid, registerEvent);
-
-            this.connection.OnConnected += Connection_OnConnected;
-            this.connection.OnDisconnected += Connection_OnDisconnected;
-            this.connection.OnApplicationDidLaunch += Connection_OnApplicationDidLaunch;
-            this.connection.OnApplicationDidTerminate += Connection_OnApplicationDidTerminate;
-            this.connection.OnKeyDown += Connection_OnKeyDown;
-            this.connection.OnWillAppear += Connection_OnWillAppear;
-            this.connection.OnWillDisappear += Connection_OnWillDisappear;
-            this.connection.OnSendToPlugin += Connection_OnSendToPlugin;
-            this.connection.OnTitleParametersDidChange += Connection_OnTitleParametersDidChange;
-
-            // Start the connection
-            connection.Run();
-
-            // Wait for up to 10 seconds to connect, if it fails, the app will exit
-            if (this.connectEvent.WaitOne(TimeSpan.FromSeconds(10)))
-            {
-                // We connected, loop every second until we disconnect
-                while (!this.disconnectEvent.WaitOne(TimeSpan.FromMilliseconds(1000)))
+            try
+            {
+                this.connection = new StreamDeckConnection(port, uuid, registerEvent);
+
+                this.connection.OnConnected += Connection_OnConnected;
+                this.connection.OnDisconnected += Connection_OnDisconnected;
+                this.connection.OnApplicationDidLaunch += Connection_OnApplicationDidLaunch;
+                this.connection.OnApplicationDidTerminate += Connection_OnApplicationDidTerminate;
+                this.connection.OnKeyDown += Connection_OnKeyDown;
+                this.connection.OnWillAppear += Connection_OnWillAppear;
+                this.connection.OnWillDisappear += Connection_OnWillDisappear;
+                this.connection.OnSendToPlugin += Connection_OnSendToPlugin;
+                this.connection.OnTitleParametersDidChange += Connection_OnTitleParametersDidChange;
+
+                // Start the connection
+                connection.Run();
+
+                // Wait for up to 10 seconds to connect, if it fails, the app will exit
+                if (this.connectEvent.WaitOne(TimeSpan.FromSeconds(10)))
+                {
+                    // We connected, loop every second until we disconnect
+                    while (!this.disconnectEvent.WaitOne(TimeSpan.FromMilliseconds(1000)))
+                    {
+                        await RunTickAsync();
+                    }
+                }
+                else
                 {
-                    await RunTickAsync();
+                    Console.WriteLine("Mix It Up Plugin failed to connect to Stream Deck");
                 }
             }
-            else
+            catch (Exception ex)
             {
-                Console.WriteLine("Mix It Up Plugin failed to connect to Stream Deck");
+                Console.WriteLine($"Mix It Up Plugin crashed: {ex.ToString()}");
             }
         }
 

diff --git a/MixItUp.StreamDeckPlugin/manifest.json b/MixItUp.StreamDeckPlugin/manifest.json
@@ -43,7 +43,7 @@
   "Name": "Mix It Up",
   "Icon": "Images/categoryIcon",
   "URL": "https://mixitupapp.com/",
-  "Version": "4.1.0",
+  "Version": "4.1.1",
   "CodePath": "MixItUp.StreamDeckPlugin.exe",
   "Category": "Mix It Up",
   "CategoryIcon": "Images/categoryIcon",

diff --git a/MixItUp.WPF/Controls/MainControls/GiveawayControl.xaml.cs b/MixItUp.WPF/Controls/MainControls/GiveawayControl.xaml.cs
@@ -526,7 +526,7 @@ private async void GlobalEvents_OnChatCommandMessageReceived(object sender, Chat
             }
             catch (Exception ex)
             {
-                Logger.Log(ex);
+                MixItUp.Base.Util.Logger.Log(ex);
             }
         }
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
                 catch (Exception ex)
                 {
-                    Logger.Log(ex);
+                    MixItUp.Base.Util.Logger.Log(ex);
                 }
             }
@@ Expand Down @@