Merge pull request #5440 from DonLakeFlyer/StableFixes

Stable fixes

Merge pull request #5440 from DonLakeFlyer/StableFixes
Stable fixes
bc4ee574 · Don Gagne · GitHub · d000ecef · bcf9e70b · bc4ee574
Commit bc4ee574 authored Jul 15, 2017 by Don Gagne Committed by GitHub Jul 15, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Survey.SettingsGroup.json src/MissionManager/Survey.SettingsGroup.json +2 -2

MainWindow.cc src/ui/MainWindow.cc +1 -1

No files found.
--- a/src/MissionManager/Survey.SettingsGroup.json
+++ b/src/MissionManager/Survey.SettingsGroup.json
@@ -64,7 +64,7 @@
    "min":              0,
    "max":              85,
    "units":            "%",
-    "defaultValue":     10
+    "defaultValue":     70
 },
 {
    "name":             "SideOverlap",
@@ -74,7 +74,7 @@
    "min":              0,
    "max":              85,
    "units":            "%",
-    "defaultValue":     10
+    "defaultValue":     70
 },
 {
    "name":             "CameraSensorWidth",

--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -296,7 +296,7 @@ QString MainWindow::_getWindowGeometryKey()
 #ifndef __mobile__
 MAVLinkDecoder* MainWindow::_mavLinkDecoderInstance(void)
 {
-    if (_mavlinkDecoder) {
+    if (!_mavlinkDecoder) {
        _mavlinkDecoder = new MAVLinkDecoder(qgcApp()->toolbox()->mavlinkProtocol());
        connect(_mavlinkDecoder, &MAVLinkDecoder::valueChanged, this, &MainWindow::valueChanged);
    }