Showing the changes to interface/src/Menu.cpp (1 of 233 files). Show all
Unified · Split
| @@ -124,10 +124,12 @@ Menu::Menu() { · 123 unmodified lines | ||
| 124 | 124 | // Edit > Running Scripts |
| 125 | 125 | auto action = addActionToQMenuAndActionHash(editMenu, MenuOption::RunningScripts, Qt::CTRL | Qt::Key_J); |
| 126 | 126 | connect(action, &QAction::triggered, [] { |
| 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); | |
| 127 | + if (!qApp->getLoginDialogPoppedUp()) { | |
| 128 | + static const QUrl widgetUrl("hifi/dialogs/RunningScripts.qml"); | |
| 129 | + static const QUrl tabletUrl("hifi/dialogs/TabletRunningScripts.qml"); | |
| 130 | + static const QString name("RunningScripts"); | |
| 131 | + qApp->showDialog(widgetUrl, tabletUrl, name); | |
| 132 | + } | |
| 131 | 133 | }); |
| 132 | 134 | |
| 133 | 135 | editMenu->addSeparator(); |
| @@ -248,8 +250,10 @@ Menu::Menu() { · 114 unmodified lines | ||
| 248 | 250 | // Settings > General... |
| 249 | 251 | action = addActionToQMenuAndActionHash(settingsMenu, MenuOption::Preferences, Qt::CTRL | Qt::Key_G, nullptr, nullptr); |
| 250 | 252 | connect(action, &QAction::triggered, [] { |
| 251 | − qApp->showDialog(QString("hifi/dialogs/GeneralPreferencesDialog.qml"), | |
| 252 | − QString("hifi/tablet/TabletGeneralPreferences.qml"), "GeneralPreferencesDialog"); | |
| 253 | + if (!qApp->getLoginDialogPoppedUp()) { | |
| 254 | + qApp->showDialog(QString("hifi/dialogs/GeneralPreferencesDialog.qml"), | |
| 255 | + QString("hifi/tablet/TabletGeneralPreferences.qml"), "GeneralPreferencesDialog"); | |
| 256 | + } | |
| 253 | 257 | }); |
| 254 | 258 | |
| 255 | 259 | // Settings > Controls... |
| @@ -809,7 +813,7 @@ Menu::Menu() { · 553 unmodified lines | ||
| 809 | 813 | connect(action, &QAction::triggered, qApp, []() { std::thread(crash::newFault).join(); }); |
| 810 | 814 | |
| 811 | 815 | // Developer > Show Statistics |
| 812 | − addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::Stats); | |
| 816 | + addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::Stats, 0, true); | |
| 813 | 817 | |
| 814 | 818 | // Developer > Show Animation Statistics |
| 815 | 819 | addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::AnimStats); |