=== modified file 'ViewFinderView.qml'
--- ViewFinderView.qml	2016-02-23 11:46:52 +0000
+++ ViewFinderView.qml	2016-02-29 14:31:36 +0000
@@ -110,14 +110,6 @@
                         if (photoRollHint.necessary && !main.transfer) photoRollHint.enable();
                         camera.photoCaptureInProgress = false;
                     }
-
-                    if (main.transfer) {
-                        if (main.transfer.contentType === ContentType.Videos) {
-                            viewFinderView.captureMode = Camera.CaptureVideo;
-                        } else {
-                            viewFinderView.captureMode = Camera.CaptureStillImage;
-                        }
-                    }
                 }
             }
 

=== modified file 'camera-app.qml'
--- camera-app.qml	2016-02-23 11:46:52 +0000
+++ camera-app.qml	2016-02-29 14:31:36 +0000
@@ -312,16 +312,10 @@
         onExportRequested: {
             viewSwitcher.switchToViewFinder();
 
-            // The exportRequested event can arrive before or after the
-            // app is active, but setting the recording type before the
-            // capture becomes ready does not have any effect.
-            // See camera.imageCapture.onReadyChanged for the other case.
-            if (viewFinderView.camera.imageCapture.ready) {
-                if (transfer.contentType === ContentType.Videos) {
-                    viewFinderView.captureMode = Camera.CaptureVideo;
-                } else {
-                    viewFinderView.captureMode = Camera.CaptureStillImage;
-                }
+            if (transfer.contentType === ContentType.Videos) {
+                viewFinderView.captureMode = Camera.CaptureVideo;
+            } else {
+                viewFinderView.captureMode = Camera.CaptureStillImage;
             }
             main.transfer = transfer;
         }