Commit 8ce88bf2 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Make sure that it doesn't crash on kontact

parent 77047101
Pipeline #64784 passed with stage
in 5 minutes and 30 seconds
...@@ -72,16 +72,18 @@ void MainWindow::initActions() ...@@ -72,16 +72,18 @@ void MainWindow::initActions()
"the application-wide shortcuts.")); "the application-wide shortcuts."));
KStandardAction::configureToolbars(this, &MainWindow::configureToolbars, actionCollection()); KStandardAction::configureToolbars(this, &MainWindow::configureToolbars, actionCollection());
KStandardAction::preferences(this, &MainWindow::configure, actionCollection()); KStandardAction::preferences(this, &MainWindow::configure, actionCollection());
mHamburgerMenu = KStandardAction::hamburgerMenu(nullptr, nullptr, actionCollection()); if (menuBar()) {
mHamburgerMenu->setShowMenuBarAction(mShowMenuBarAction); mHamburgerMenu = KStandardAction::hamburgerMenu(nullptr, nullptr, actionCollection());
mHamburgerMenu->setMenuBar(menuBar()); mHamburgerMenu->setShowMenuBarAction(mShowMenuBarAction);
connect(mHamburgerMenu, &KHamburgerMenu::aboutToShowMenu, this, [this]() { mHamburgerMenu->setMenuBar(menuBar());
updateHamburgerMenu(); connect(mHamburgerMenu, &KHamburgerMenu::aboutToShowMenu, this, [this]() {
// Immediately disconnect. We only need to run this once, but on demand. updateHamburgerMenu();
// NOTE: The nullptr at the end disconnects all connections between // Immediately disconnect. We only need to run this once, but on demand.
// q and mHamburgerMenu's aboutToShowMenu signal. // NOTE: The nullptr at the end disconnects all connections between
disconnect(mHamburgerMenu, &KHamburgerMenu::aboutToShowMenu, this, nullptr); // q and mHamburgerMenu's aboutToShowMenu signal.
}); disconnect(mHamburgerMenu, &KHamburgerMenu::aboutToShowMenu, this, nullptr);
});
}
} }
void MainWindow::updateHamburgerMenu() void MainWindow::updateHamburgerMenu()
......
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