+ when checking for custom toolbars do not auto-create sub-groups in …

…user parameters
FreeCAD · Dec 6, 2014 · ec4a496 · ec4a496
1 parent c931bee
commit ec4a496
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/Gui/DlgToolbarsImp.cpp b/src/Gui/DlgToolbarsImp.cpp
@@ -224,7 +224,12 @@ void DlgCustomToolbars::importCustomToolbars(const QByteArray& name)
 {
     ParameterGrp::handle hGrp = App::GetApplication().GetUserParameter().GetGroup("BaseApp")->GetGroup("Workbench");
     const char* subgroup = (type == Toolbar ? "Toolbar" : "Toolboxbar");
-    hGrp = hGrp->GetGroup(name.constData())->GetGroup(subgroup);
+    if (!hGrp->HasGroup(name.constData()))
+        return;
+    hGrp = hGrp->GetGroup(name.constData());
+    if (!hGrp->HasGroup(subgroup))
+        return;
+    hGrp = hGrp->GetGroup(subgroup);
 
     std::vector<Base::Reference<ParameterGrp> > hGrps = hGrp->GetGroups();
     CommandManager& rMgr = Application::Instance->commandManager();