Unverified Commit 5e63260b authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #7085 from mavlink/waitOnReset

Avoid sending camera commands while a reset is pending.
parents f39452b3 8311619d
This diff is collapsed.
...@@ -246,6 +246,7 @@ protected: ...@@ -246,6 +246,7 @@ protected:
QMap<QString, QGCCameraParamIO*> _paramIO; QMap<QString, QGCCameraParamIO*> _paramIO;
int _storageInfoRetries; int _storageInfoRetries;
int _captureInfoRetries; int _captureInfoRetries;
bool _resetting;
//-- Parameters that require a full update //-- Parameters that require a full update
QMap<QString, QStringList> _requestUpdates; QMap<QString, QStringList> _requestUpdates;
QStringList _updatesToRequest; QStringList _updatesToRequest;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment