From 317901401121d291029112cfcd4ec791ac74ba5e Mon Sep 17 00:00:00 2001
From: Thomas Gubler <thomasgubler@gmail.com>
Date: Mon, 30 Dec 2013 23:37:22 +0100
Subject: [PATCH] flightgear: prevent aircraft from flying with no input

---
 src/comm/QGCFlightGearLink.cc           |  2 +-
 src/ui/QGCHilFlightGearConfiguration.ui | 15 +++------------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/comm/QGCFlightGearLink.cc b/src/comm/QGCFlightGearLink.cc
index e9be433b1..d110aa0ff 100644
--- a/src/comm/QGCFlightGearLink.cc
+++ b/src/comm/QGCFlightGearLink.cc
@@ -598,7 +598,7 @@ bool QGCFlightGearLink::connectSimulation()
     }
     flightGearArguments << QString("--lat=%1").arg(UASManager::instance()->getHomeLatitude());
     flightGearArguments << QString("--lon=%1").arg(UASManager::instance()->getHomeLongitude());
-    flightGearArguments << QString("--altitude=%1").arg(UASManager::instance()->getHomeAltitude());
+//    flightGearArguments << QString("--altitude=%1").arg(UASManager::instance()->getHomeAltitude());
     // Add new argument with this: flightGearArguments << "";
     //flightGearArguments << QString("--aircraft=%2").arg(aircraft);
 
diff --git a/src/ui/QGCHilFlightGearConfiguration.ui b/src/ui/QGCHilFlightGearConfiguration.ui
index d06f17422..b27ff74a1 100644
--- a/src/ui/QGCHilFlightGearConfiguration.ui
+++ b/src/ui/QGCHilFlightGearConfiguration.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>237</width>
-    <height>204</height>
+    <height>209</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -26,16 +26,7 @@
    <bool>false</bool>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
+   <property name="margin">
     <number>0</number>
    </property>
    <property name="spacing">
@@ -77,7 +68,7 @@
       </sizepolicy>
      </property>
      <property name="plainText">
-      <string>--in-air --roll=0 --pitch=0 --vc=90 --heading=300 --timeofday=noon --disable-hud-3d --disable-fullscreen --geometry=400x300 --disable-anti-alias-hud --wind=0@0 --turbulence=0.0 --prop:/sim/frame-rate-throttle-hz=30 --control=mouse --disable-intro-music --disable-sound --disable-random-objects --disable-ai-models --shading-flat --fog-disable --disable-specular-highlight --disable-random-objects --disable-panel --disable-clouds --fdm=jsb --units-meters --prop:/engines/engine/running=true</string>
+      <string>--roll=0 --pitch=0 --vc=0 --heading=300 --timeofday=noon --disable-hud-3d --disable-fullscreen --geometry=400x300 --disable-anti-alias-hud --wind=0@0 --turbulence=0.0 --prop:/sim/frame-rate-throttle-hz=30 --control=mouse --disable-intro-music --disable-sound --disable-random-objects --disable-ai-models --shading-flat --fog-disable --disable-specular-highlight --disable-random-objects --disable-panel --disable-clouds --fdm=jsb --units-meters --prop:/engines/engine/running=true</string>
      </property>
     </widget>
    </item>
-- 
2.22.0