Merge pull request #2508 from dogmaphobic/checkValidWidget

Fixing crash bug.

src/ui/MainWindow.cc

@@ -329,25 +329,25 @@ void MainWindow::_showDockWidget(const QString& name, bool show)
 {
     // Create the inner widget if we need to
     if (!_mapName2DockWidget.contains(name)) {
-        _createInnerDockWidget(name);
+        if(!_createInnerDockWidget(name)) {
+            qWarning() << "Trying to load non existing widget:" << name;
+            return;
+        }
     }
-
     Q_ASSERT(_mapName2DockWidget.contains(name));
     QGCDockWidget* dockWidget = _mapName2DockWidget[name];
     Q_ASSERT(dockWidget);
-
     dockWidget->setVisible(show);
-
     Q_ASSERT(_mapName2Action.contains(name));
     _mapName2Action[name]->setChecked(show);
 }
 
 /// Creates the specified inner dock widget and adds to the QDockWidget
-void MainWindow::_createInnerDockWidget(const QString& widgetName)
+bool MainWindow::_createInnerDockWidget(const QString& widgetName)
 {
     QGCDockWidget* widget = NULL;
     QAction *action = _mapName2Action[widgetName];
-
+    if(action) {
         switch(action->data().toInt()) {
             case MAVLINK_INSPECTOR:
                 widget = new QGCMAVLinkInspector(widgetName, action, qgcApp()->toolbox()->mavlinkProtocol(),this);
@@ -371,11 +371,14 @@ void MainWindow::_createInnerDockWidget(const QString& widgetName)
                 widget= new QGCTabbedInfoView(widgetName, action, this);
                 break;
         }
-
         if(action->data().toInt() == INFO_VIEW) {
             qobject_cast<QGCTabbedInfoView*>(widget)->addSource(mavlinkDecoder);
         }
+        if(widget) {
             _mapName2DockWidget[widgetName] = widget;
+        }
+    }
+    return widget != NULL;
 }
 
 void MainWindow::_hideAllDockWidgets(void)

src/ui/MainWindow.h

@@ -221,7 +221,7 @@ private:
     void _loadCurrentViewState(void);
 
 #ifndef __mobile__
-    void _createInnerDockWidget(const QString& widgetName);
+    bool _createInnerDockWidget(const QString& widgetName);
     void _buildCommonWidgets(void);
     void _hideAllDockWidgets(void);
     void _showDockWidget(const QString &name, bool show);