Fix two crasher bugs in hs.camera watcher functions. Fixes HAMMERSPOO…

…N-D4
Hammerspoon · Jul 1, 2022 · 3e7b042 · 3e7b042
1 parent 22f1e69
commit 3e7b042
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/extensions/camera/libcamera.m b/extensions/camera/libcamera.m
@@ -448,6 +448,10 @@ static int stopWatcher(lua_State *L) {
         [skin checkArgs:LS_TBREAK];
     }
 
+    if (!deviceWatcher) {
+        return 0;
+    }
+
     NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
     [center removeObserver:deviceWatcherAddedObserver
                       name:AVCaptureDeviceWasConnectedNotification
@@ -474,7 +478,7 @@ static int isWatcherRunning(lua_State *L) {
     LuaSkin *skin = [LuaSkin sharedWithState:L];
     [skin checkArgs:LS_TBREAK];
 
-    lua_pushboolean(L, deviceWatcher->running);
+    lua_pushboolean(L, deviceWatcher && deviceWatcher->running);
 
     return 1;
 }