Skip to content

Q
qgroundcontrol
Unverified Commit 8287b37f authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #8629 from AWilco/patch-1 

Correctly set parent of QGCCorePlugin
parents f711da24 1893a920
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/QGCToolbox.cc
View file @ 8287b37f
...@@ -134,13 +134,13 @@ void QGCToolbox::_scanAndLoadPlugins(QGCApplication* app) ...@@ -134,13 +134,13 @@ void QGCToolbox::_scanAndLoadPlugins(QGCApplication* app)
{ {
#if defined (QGC_CUSTOM_BUILD) #if defined (QGC_CUSTOM_BUILD)
//-- Create custom plugin (Static) //-- Create custom plugin (Static)
_corePlugin = (QGCCorePlugin*) new CUSTOMCLASS(app, app->toolbox()); _corePlugin = (QGCCorePlugin*) new CUSTOMCLASS(app, this);
if(_corePlugin) { if(_corePlugin) {
return; return;
} }
#endif #endif
//-- No plugins found, use default instance //-- No plugins found, use default instance
_corePlugin = new QGCCorePlugin(app, app->toolbox()); _corePlugin = new QGCCorePlugin(app, this);
} }
QGCTool::QGCTool(QGCApplication* app, QGCToolbox* toolbox) QGCTool::QGCTool(QGCApplication* app, QGCToolbox* toolbox)
......
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