diff --git a/app/src/main/java/com/xypower/camera2raw/Camera2RawFragment.java b/app/src/main/java/com/xypower/camera2raw/Camera2RawFragment.java
index b430e2d..cbb82c2 100644
--- a/app/src/main/java/com/xypower/camera2raw/Camera2RawFragment.java
+++ b/app/src/main/java/com/xypower/camera2raw/Camera2RawFragment.java
@@ -521,7 +521,7 @@ public class Camera2RawFragment extends Fragment {
                 handleCompletionLocked(requestId, jpegBuilder, mJpegResultQueue);
                 handleCompletionLocked(requestId, rawBuilder, mRawResultQueue);
 
-//                finishedCaptureLocked();
+                finishedCaptureLocked();
             }
 
             showToast(sb.toString());
@@ -1520,6 +1520,7 @@ public class Camera2RawFragment extends Fragment {
                     ImageSaver.ImageSaverBuilder value = item.getValue();
                     if (value.mImage == null) {
                         entry = item;
+                        break;
                     }
                 }
             }