From 98fb958fd07e4eb37dd70de703645174e9140132 Mon Sep 17 00:00:00 2001 From: Mohammed Sameer Date: Thu, 12 Sep 2013 02:56:36 +0300 Subject: [PATCH] Fix some QML TypError resulting from overlay.cam being null --- qml/ImageModeSettings.qml | 2 +- qml/ImageOverlay.qml | 2 +- qml/VideoOverlay.qml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qml/ImageModeSettings.qml b/qml/ImageModeSettings.qml index a0ef4aa..4ea5314 100644 --- a/qml/ImageModeSettings.qml +++ b/qml/ImageModeSettings.qml @@ -53,7 +53,7 @@ Flickable { // loop for checked if we bind the checked property to the settings value. Component.onCompleted: checked = settings.faceDetectionEnabled onCheckedChanged: settings.faceDetectionEnabled = checked - visible: !camera.quirks.hasQuirk(Quirks.NoFaceDetection) + visible: camera ? !camera.quirks.hasQuirk(Quirks.NoFaceDetection) : false } CameraSettings { diff --git a/qml/ImageOverlay.qml b/qml/ImageOverlay.qml index 2add9c5..abcadbc 100644 --- a/qml/ImageOverlay.qml +++ b/qml/ImageOverlay.qml @@ -132,7 +132,7 @@ Item { tools: CameraToolBarTools { FlashButton { onClicked: toolBar.push(tools) - visible: !overlay.cam.quirks.hasQuirk(Quirks.NoFlash) + visible: overlay.cam ? !overlay.cam.quirks.hasQuirk(Quirks.NoFlash) : false } ImageSceneButton { diff --git a/qml/VideoOverlay.qml b/qml/VideoOverlay.qml index 1210f82..60e5467 100644 --- a/qml/VideoOverlay.qml +++ b/qml/VideoOverlay.qml @@ -118,11 +118,11 @@ Item { tools: CameraToolBarTools { VideoTorchButton { camera: cam - visible: !overlay.cam.quirks.hasQuirk(Quirks.NoVideoTorch) + visible: overlay.cam ? !overlay.cam.quirks.hasQuirk(Quirks.NoVideoTorch) : false } VideoSceneButton { - property bool hide: (overlay.recording && overlay.cam.quirks.hasQuirk(Quirks.NoSceneModeChangeDuringRecording)) || overlay.cam.quirks.hasQuirk(Quirks.NoNightSceneMode) + property bool hide: overlay.cam ? (overlay.recording && overlay.cam.quirks.hasQuirk(Quirks.NoSceneModeChangeDuringRecording)) || overlay.cam.quirks.hasQuirk(Quirks.NoNightSceneMode) : false visible: !hide onClicked: toolBar.push(tools) } -- 2.25.1