Avoid sending camera commands while a reset is pending.

8311619d · Gus Grubba · Gus Grubba · f39452b3 · 8311619d · 8311619d
Commit 8311619d authored Dec 11, 2018 by Gus Grubba Committed by Gus Grubba Dec 11, 2018
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 133 additions and 104 deletions

QGCCameraControl.cc src/Camera/QGCCameraControl.cc +132 -104

QGCCameraControl.h src/Camera/QGCCameraControl.h +1 -0

No files found.
--- a/src/Camera/QGCCameraControl.cc
+++ b/src/Camera/QGCCameraControl.cc
--- a/src/Camera/QGCCameraControl.h
+++ b/src/Camera/QGCCameraControl.h
@@ -246,6 +246,7 @@ protected:
    QMap<QString, QGCCameraParamIO*>    _paramIO;
    int                                 _storageInfoRetries;
    int                                 _captureInfoRetries;
+    bool                                _resetting;
    //-- Parameters that require a full update
    QMap<QString, QStringList>          _requestUpdates;
    QStringList                         _updatesToRequest;