Commit fddfacd9 authored by Nate Weibley's avatar Nate Weibley

Fix segfault on Linux at close for #3164 (#3166)

* Remove leftover debugging message
* Fix segfault on Linux at close for #3164
parent aebd9fe9
...@@ -198,7 +198,6 @@ int PX4FirmwarePlugin::manualControlReservedButtonCount(void) ...@@ -198,7 +198,6 @@ int PX4FirmwarePlugin::manualControlReservedButtonCount(void)
bool PX4FirmwarePlugin::isCapable(FirmwareCapabilities capabilities) bool PX4FirmwarePlugin::isCapable(FirmwareCapabilities capabilities)
{ {
qDebug() << (capabilities & (MavCmdPreflightStorageCapability | SetFlightModeCapability | PauseVehicleCapability)) << capabilities;
return (capabilities & (MavCmdPreflightStorageCapability | SetFlightModeCapability | PauseVehicleCapability)) == capabilities; return (capabilities & (MavCmdPreflightStorageCapability | SetFlightModeCapability | PauseVehicleCapability)) == capabilities;
} }
......
...@@ -282,6 +282,10 @@ MainWindow::MainWindow() ...@@ -282,6 +282,10 @@ MainWindow::MainWindow()
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; _instance = NULL;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment