Showing the changes to interface/src/Menu.cpp (1 of 11 files). Show all
Unified · Split
| @@ -123,10 +123,12 @@ Menu::Menu() { · 122 unmodified lines | ||
| 123 | 123 | // Edit > Running Scripts |
| 124 | 124 | auto action = addActionToQMenuAndActionHash(editMenu, MenuOption::RunningScripts, Qt::CTRL | Qt::Key_J); |
| 125 | 125 | connect(action, &QAction::triggered, [] { |
| 126 | − static const QUrl widgetUrl("hifi/dialogs/RunningScripts.qml"); | |
| 127 | − static const QUrl tabletUrl("hifi/dialogs/TabletRunningScripts.qml"); | |
| 128 | − static const QString name("RunningScripts"); | |
| 129 | − qApp->showDialog(widgetUrl, tabletUrl, name); | |
| 126 | + if (!qApp->getLoginDialogPoppedUp()) { | |
| 127 | + static const QUrl widgetUrl("hifi/dialogs/RunningScripts.qml"); | |
| 128 | + static const QUrl tabletUrl("hifi/dialogs/TabletRunningScripts.qml"); | |
| 129 | + static const QString name("RunningScripts"); | |
| 130 | + qApp->showDialog(widgetUrl, tabletUrl, name); | |
| 131 | + } | |
| 130 | 132 | }); |
| 131 | 133 | |
| 132 | 134 | editMenu->addSeparator(); |
| @@ -233,8 +235,10 @@ Menu::Menu() { · 100 unmodified lines | ||
| 233 | 235 | // Settings > General... |
| 234 | 236 | action = addActionToQMenuAndActionHash(settingsMenu, MenuOption::Preferences, Qt::CTRL | Qt::Key_G, nullptr, nullptr); |
| 235 | 237 | connect(action, &QAction::triggered, [] { |
| 236 | − qApp->showDialog(QString("hifi/dialogs/GeneralPreferencesDialog.qml"), | |
| 237 | − QString("hifi/tablet/TabletGeneralPreferences.qml"), "GeneralPreferencesDialog"); | |
| 238 | + if (!qApp->getLoginDialogPoppedUp()) { | |
| 239 | + qApp->showDialog(QString("hifi/dialogs/GeneralPreferencesDialog.qml"), | |
| 240 | + QString("hifi/tablet/TabletGeneralPreferences.qml"), "GeneralPreferencesDialog"); | |
| 241 | + } | |
| 238 | 242 | }); |
| 239 | 243 | |
| 240 | 244 | // Settings > Controls... |