diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-04-17 20:53:46 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-04-17 20:53:46 -0500 |
| commit | 376421667a6432ca3d6a5dc606fa56f74c1a1051 (patch) | |
| tree | 489264f3b687dc9774e03f268c0f48a69fa5ca85 /components | |
| parent | 8a73fd241e28965b2a36b2f232112bf44f58211d (diff) | |
| parent | 3f13a5c9a4f094450f8f33eb67c6f0f7b94f6c4e (diff) | |
| download | monzero-gui-376421667a6432ca3d6a5dc606fa56f74c1a1051.tar.gz monzero-gui-376421667a6432ca3d6a5dc606fa56f74c1a1051.tar.xz monzero-gui-376421667a6432ca3d6a5dc606fa56f74c1a1051.zip | |
Merge pull request #2836
3f13a5c QRCodeScanner: don't load webcam on startup (mmbyday/selsta)
Diffstat (limited to 'components')
| -rw-r--r-- | components/QRCodeScanner.qml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/components/QRCodeScanner.qml b/components/QRCodeScanner.qml index 111e7ff6..67d76238 100644 --- a/components/QRCodeScanner.qml +++ b/components/QRCodeScanner.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018, The Monero Project +// Copyright (c) 2014-2020, The Monero Project // // All rights reserved. // @@ -53,6 +53,7 @@ Rectangle { script: { root.visible = true camera.captureMode = Camera.CaptureStillImage + camera.cameraState = Camera.ActiveState camera.start() finder.enabled = true } @@ -65,6 +66,7 @@ Rectangle { camera.stop() root.visible = false finder.enabled = false + camera.cameraState = Camera.UnloadedState } } } @@ -74,6 +76,7 @@ Rectangle { id: camera objectName: "qrCameraQML" captureMode: Camera.CaptureStillImage + cameraState: Camera.UnloadedState focus { focusMode: Camera.FocusContinuous |