Delete cad dock AFTER map tools, as they may reference it in their cleanup code

This commit is contained in:
Nyall Dawson 2021-09-28 10:25:37 +10:00
parent bcb16797d2
commit 1fb21f69fe

View File

@ -1854,9 +1854,6 @@ QgisApp::~QgisApp()
mNetworkLoggerWidgetFactory.reset();
delete mAdvancedDigitizingDockWidget;
mAdvancedDigitizingDockWidget = nullptr;
delete mInternalClipboard;
delete mQgisInterface;
delete mStyleSheetBuilder;
@ -1865,6 +1862,10 @@ QgisApp::~QgisApp()
mMapCanvas->unsetMapTool( tool );
mMapTools.reset();
// must come after deleting map tools
delete mAdvancedDigitizingDockWidget;
mAdvancedDigitizingDockWidget = nullptr;
delete mpMaptip;
delete mpGpsWidget;