don't apply the resolution if camera is not running

diff --git a/lib/qtcamimagemode.cpp b/lib/qtcamimagemode.cpp
index 6461b38..cbd5d9a 100644 (file)
--- a/lib/qtcamimagemode.cpp
+++ b/lib/qtcamimagemode.cpp
@@ -89,7 +89,7 @@ bool QtCamImageMode::capture(const QString& fileName) {
 bool QtCamImageMode::setSettings(const QtCamImageSettings& settings) {
   d->settings = settings;
 
-  if (!d_ptr->dev->q_ptr->isIdle()) {
+  if (!d_ptr->dev->q_ptr->isRunning() || !d_ptr->dev->q_ptr->isIdle()) {
     return false;
   }
 

diff --git a/lib/qtcamvideomode.cpp b/lib/qtcamvideomode.cpp
index 72d46e6..f805e99 100644 (file)
--- a/lib/qtcamvideomode.cpp
+++ b/lib/qtcamvideomode.cpp
@@ -111,7 +111,7 @@ void QtCamVideoMode::stopRecording() {
 bool QtCamVideoMode::setSettings(const QtCamVideoSettings& settings) {
   d->settings = settings;
 
-  if (isRecording()) {
+  if (!d_ptr->dev->q_ptr->isRunning() || isRecording()) {
     return false;
   }