Don't trigger modal dialog from menu handler

Brad Davis committed 10 years ago

Commit f08f54f1 parent dfe05751 file · +4 −4Browse files

Showing the changes to interface/src/Bookmarks.cpp (1 of 1 file). Show all

Unified · Split

interface/src/Bookmarks.cpp+4−4

@@ -88,11 +88,11 @@ void Bookmarks::persistToFile() { · 87 unmodified lines
88	88
89	89	void Bookmarks::setupMenus(Menu* menubar, MenuWrapper* menu) {
90	90	// Add menus/actions
91		− menubar->addActionToQMenuAndActionHash(menu, MenuOption::BookmarkLocation, 0,
92		− this, SLOT(bookmarkLocation()));
	91	+ auto bookmarkAction = menubar->addActionToQMenuAndActionHash(menu, MenuOption::BookmarkLocation);
	92	+ QObject::connect(bookmarkAction, SIGNAL(triggered()), this, SLOT(bookmarkLocation()), Qt::QueuedConnection);
93	93	_bookmarksMenu = menu->addMenu(MenuOption::Bookmarks);
94		− _deleteBookmarksAction = menubar->addActionToQMenuAndActionHash(menu, MenuOption::DeleteBookmark, 0,
95		− this, SLOT(deleteBookmark()));
	94	+ _deleteBookmarksAction = menubar->addActionToQMenuAndActionHash(menu, MenuOption::DeleteBookmark);
	95	+ QObject::connect(_deleteBookmarksAction, SIGNAL(triggered()), this, SLOT(deleteBookmark()), Qt::QueuedConnection);
96	96
97	97	// Enable/Disable menus as needed
98	98	enableMenuItems(_bookmarks.count() > 0);