Fix shutdown crash when StreamDeck is disabled

ocdtrekkie · Jan 12, 2021 · f6c7cff · f6c7cff
1 parent dc336d2
commit f6c7cff
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/modStreamDeck.vb b/modStreamDeck.vb
@@ -10,7 +10,7 @@ Module modStreamDeck
         Unload()
         My.Settings.StreamDeck_Enable = False
         My.Application.Log.WriteEntry("Stream Deck module is disabled")
-        Return "Matrix LCD module disabled"
+        Return "Stream Deck module disabled"
     End Function
 
     Function Enable() As String
@@ -45,7 +45,7 @@ Module modStreamDeck
 
     Function Unload() As String
         My.Application.Log.WriteEntry("Unloading Stream Deck module")
-        If ActiveStreamDeck.IsConnected = True Then
+        If IsNothing(ActiveStreamDeck) = False AndAlso ActiveStreamDeck.IsConnected = True Then
             ActiveStreamDeck.ShowLogo()
             ActiveStreamDeck.Dispose()
         End If