Merge branch 'master' of git@pixhawk.ethz.ch:qgroundcontrol

src/ui/HSIDisplay.cc

@@ -92,11 +92,11 @@ void HSIDisplay::paintDisplay()
         drawCircle(vwidth/2.0f, vheight/2.0f, radius, 0.1f, ringColor, &painter);
     }
 
-    drawGPS();
-
     // Draw center indicator
     drawCircle(vwidth/2.0f, vheight/2.0f, 1.0f, 0.1f, ringColor, &painter);
 
+    drawGPS();
+
 
     //drawSystemIndicator(10.0f-gaugeWidth/2.0f, 20.0f, 10.0f, 40.0f, 15.0f, &painter);
     //drawGauge(15.0f, 15.0f, gaugeWidth/2.0f, 0, 1.0f, "thrust", values.value("thrust", 0.0f), gaugeColor, &painter, qMakePair(0.45f, 0.8f), qMakePair(0.8f, 1.0f), true);