From ec4a496866d707084168425927bbb8ecc4ea9ee9 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sat, 6 Dec 2014 14:46:08 +0100 Subject: [PATCH] + when checking for custom toolbars do not auto-create sub-groups in user parameters --- src/Gui/DlgToolbarsImp.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Gui/DlgToolbarsImp.cpp b/src/Gui/DlgToolbarsImp.cpp index 1d60467fb3..2e5522b810 100644 --- 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 > hGrps = hGrp->GetGroups(); CommandManager& rMgr = Application::Instance->commandManager();