Fixed small bug with camera disconnection

Rambalac · Apr 13, 2017 · 926f39f · 926f39f
1 parent db41fb3
commit 926f39f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Core/Camera/LumixManager.cs b/Core/Camera/LumixManager.cs
@@ -173,8 +173,8 @@ private void Camera_Disconnected(Lumix obj, bool stillAvailable)
                     foundDevices.Remove(usn + host);
                     Debug.WriteLine("Undiscovered: " + usn, "Discovery");
                 }
-                Debug.WriteLine("Remove listener: " + host, "UDP");
 
+                Debug.WriteLine("Remove listener: " + host, "UDP");
             }
             else
             {

diff --git a/GMaster/Views/Commands/CameraDisconnectCommand.cs b/GMaster/Views/Commands/CameraDisconnectCommand.cs
@@ -11,7 +11,11 @@ public class CameraDisconnectCommand : AbstractParameterModelCommand<MainPageMod
 
         protected override async Task InternalExecute(ConnectedCamera parameter)
         {
-            await parameter.Camera.Disconnect();
+            var camera = parameter.Camera;
+            if (camera != null)
+            {
+                await camera.Disconnect();
+            }
         }
     }
 }