This commit is contained in:
2026-06-04 17:26:06 +01:00
parent 1b1cbf5aa4
commit aedbd87480

View File

@ -188,13 +188,20 @@ class Camera:
# Wait until the camera is ready # Wait until the camera is ready
self._waitForCameraReady() self._waitForCameraReady()
time.sleep(0.75) time.sleep(0.75)
# Check the camera mode, and see if it's disabled
if self._lastMode == 0:
# If so, break out of the loop.
print('Camera disabled. Bailing out.')
break
# Take a new picture # Take a new picture
self.oscClient.send_message('/usercamera/Capture', True) self.oscClient.send_message('/usercamera/Capture', True)
# Reset the lastPicture time, the set that happens at the start of this # Reset the lastPicture time, the set that happens at the start of this
# function is not fast enough and causes race conditions. # function is not fast enough and causes race conditions.
self.lastPicture = time.perf_counter() self.lastPicture = time.perf_counter()
# Wait for the camera to be ready one last time to prevent a cycle # Wait for the camera to be ready one last time to prevent a cycle
self._waitForCameraReady() # but only if the camera is still enabled.
if self._lastMode != 0:
self._waitForCameraReady()
except TimeoutError: except TimeoutError:
print('WARNING: Timeout occured during multishot. Bailing out.') print('WARNING: Timeout occured during multishot. Bailing out.')