From 0a957bc97cd04c65855474831c26ca28646b9fdd Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 1 Apr 2026 13:25:40 +0000
Subject: [PATCH] Fix crash when pressing volume buttons during active video
 recording.

---
 .../src/main/java/org/signal/camera/hud/StandardCameraHud.kt   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/feature/camera/src/main/java/org/signal/camera/hud/StandardCameraHud.kt b/feature/camera/src/main/java/org/signal/camera/hud/StandardCameraHud.kt
index 993b786ebb..cb7434776d 100644
--- a/feature/camera/src/main/java/org/signal/camera/hud/StandardCameraHud.kt
+++ b/feature/camera/src/main/java/org/signal/camera/hud/StandardCameraHud.kt
@@ -172,6 +172,7 @@ fun BoxScope.StandardCameraHud(
                 isRecordingFromVolumeKey = false
               }
             } else if (keyCode == activeVolumeKeyCode &&
+              !state.isRecording &&
               !isRecordingFromVolumeKey &&
               volumeKeyPressStartTime > 0 &&
               nativeEvent.eventTime - volumeKeyPressStartTime >= viewConfiguration.longPressTimeoutMillis
@@ -192,7 +193,7 @@ fun BoxScope.StandardCameraHud(
               if (isRecordingFromVolumeKey) {
                 isRecordingFromVolumeKey = false
                 emitter(StandardCameraHudEvents.VideoCaptureStopped)
-              } else if (volumeKeyPressStartTime > 0) {
+              } else if (volumeKeyPressStartTime > 0 && !state.isRecording) {
                 emitter(StandardCameraHudEvents.PhotoCaptureTriggered)
               }
               volumeKeyPressStartTime = 0