From f08f54fd22cebfedfe483ea46ffe05f33cad4224 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Mon, 7 Mar 2016 21:48:07 -0800 Subject: [PATCH] Don't trigger modal dialog from menu handler --- interface/src/Bookmarks.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/src/Bookmarks.cpp b/interface/src/Bookmarks.cpp index 0a885493e3..a53ba38b36 100644 --- a/interface/src/Bookmarks.cpp +++ b/interface/src/Bookmarks.cpp @@ -88,11 +88,11 @@ void Bookmarks::persistToFile() { void Bookmarks::setupMenus(Menu* menubar, MenuWrapper* menu) { // Add menus/actions - menubar->addActionToQMenuAndActionHash(menu, MenuOption::BookmarkLocation, 0, - this, SLOT(bookmarkLocation())); + auto bookmarkAction = menubar->addActionToQMenuAndActionHash(menu, MenuOption::BookmarkLocation); + QObject::connect(bookmarkAction, SIGNAL(triggered()), this, SLOT(bookmarkLocation()), Qt::QueuedConnection); _bookmarksMenu = menu->addMenu(MenuOption::Bookmarks); - _deleteBookmarksAction = menubar->addActionToQMenuAndActionHash(menu, MenuOption::DeleteBookmark, 0, - this, SLOT(deleteBookmark())); + _deleteBookmarksAction = menubar->addActionToQMenuAndActionHash(menu, MenuOption::DeleteBookmark); + QObject::connect(_deleteBookmarksAction, SIGNAL(triggered()), this, SLOT(deleteBookmark()), Qt::QueuedConnection); // Enable/Disable menus as needed enableMenuItems(_bookmarks.count() > 0);