Commit 7b1da13b authored by Boudewijn Rempt's avatar Boudewijn Rempt

Fix crash when editing toolbars

parent 3348464e
......@@ -379,6 +379,7 @@ KisMainWindow::KisMainWindow()
QString doc;
QStringList allFiles = KGlobal::dirs()->findAllResources("data", "krita/krita.rc");
setXMLFile(findMostRecentXMLFile(allFiles, doc));
setLocalXMLFile(KStandardDirs::locateLocal("data", "krita/krita.rc"));
guiFactory()->addClient(this);
......@@ -389,8 +390,7 @@ KisMainWindow::KisMainWindow()
if (toolBar) {
if (toolBar->objectName() == "BrushesAndStuff") {
d->brushesAndStuff = toolBar;
d->brushesAndStuff->setEnabled(false);
toolBar->setEnabled(false);
}
KToggleAction* act = new KToggleAction(i18n("Show %1 Toolbar", toolBar->windowTitle()), this);
......@@ -1794,10 +1794,6 @@ void KisMainWindow::subWindowActivated()
}
}
if (d->brushesAndStuff) {
d->brushesAndStuff->setEnabled(enabled);
}
updateCaption();
d->viewManager->actionManager()->updateGUI();
}
......
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