Merge pull request #524 from Dronecode/fix-notify-current-settings

camera: fix notification if current options change
mavlink · Aug 31, 2018 · 6b14177 · 6b14177
2 parents 0433695 + d01be9a
commit 6b14177
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/backend/cmake/MacOSXFrameworkInfo.plist.in b/backend/cmake/MacOSXFrameworkInfo.plist.in
@@ -17,7 +17,7 @@
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2.0</string>
+	<string>0.2.1</string>
         <key>MinimumOSVersion</key>
         <string>11.3</string>
 	<key>CSResourcesFileMapped</key>

diff --git a/backend/tools/push_backend_framework_to_s3.bash b/backend/tools/push_backend_framework_to_s3.bash
@@ -4,7 +4,7 @@ set -e
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 FAT_BIN_DIR=${SCRIPT_DIR}/../../build/fat_bin
-CURRENT_VERSION=0.2.0
+CURRENT_VERSION=0.2.1
 
 aws s3 cp ${FAT_BIN_DIR}/dronecode-backend.zip s3://dronecode-sdk/dronecode-backend-latest.zip
 aws s3api put-object-acl --bucket dronecode-sdk --key dronecode-backend-latest.zip --acl public-read

diff --git a/plugins/camera/camera_impl.cpp b/plugins/camera/camera_impl.cpp
@@ -1337,6 +1337,10 @@ void CameraImpl::refresh_params()
 
     std::vector<std::string> params{};
     if (!_camera_definition->get_unknown_params(params)) {
+        // We're assuming that we changed one option and this did not cause
+        // any other possible settings to change. However, we still would
+        // like to notify the current settings with this one change.
+        notify_current_settings();
         return;
     }