From fddfacd9ad14a5a574ca04ae22c85a64db13e9e9 Mon Sep 17 00:00:00 2001
From: Nate Weibley <nweibley@gmail.com>
Date: Fri, 8 Apr 2016 18:53:30 -0400
Subject: [PATCH] Fix segfault on Linux at close for #3164 (#3166)

* Remove leftover debugging message
* Fix segfault on Linux at close for #3164
---
 src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc | 1 -
 src/ui/MainWindow.cc                        | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc b/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc
index 1c15a10917..d28f8b6c82 100644
--- a/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc
+++ b/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc
@@ -198,7 +198,6 @@ int PX4FirmwarePlugin::manualControlReservedButtonCount(void)
 
 bool PX4FirmwarePlugin::isCapable(FirmwareCapabilities capabilities)
 {
-    qDebug() << (capabilities & (MavCmdPreflightStorageCapability | SetFlightModeCapability | PauseVehicleCapability)) << capabilities;
     return (capabilities & (MavCmdPreflightStorageCapability | SetFlightModeCapability | PauseVehicleCapability)) == capabilities;
 }
 
diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index 3dae012eda..08add8ae21 100644
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -282,6 +282,10 @@ MainWindow::MainWindow()
 
 MainWindow::~MainWindow()
 {
+    // This needs to happen before we get into the QWidget dtor
+    // otherwise  the QML engine reads freed data and tries to
+    // destroy MainWindow a second time.
+    delete _mainQmlWidgetHolder;
     _instance = NULL;
 }
 
-- 
GitLab