Showing the changes to interface/src/Menu.cpp (1 of 20 files). Show all
Unified · Split
| @@ -21,6 +21,7 @@ · 20 unmodified lines | ||
| 21 | 21 | #include <SettingHandle.h> |
| 22 | 22 | #include <UserActivityLogger.h> |
| 23 | 23 | #include <VrMenu.h> |
| 24 | +#include <ScriptEngines.h> | |
| 24 | 25 | |
| 25 | 26 | #include "Application.h" |
| 26 | 27 | #include "AccountManager.h" |
| @@ -114,13 +115,15 @@ Menu::Menu() { · 87 unmodified lines | ||
| 114 | 115 | Qt::CTRL | Qt::SHIFT | Qt::Key_O, qApp, SLOT(loadScriptURLDialog()), |
| 115 | 116 | QAction::NoRole, UNSPECIFIED_POSITION, "Advanced"); |
| 116 | 117 | |
| 118 | + auto scriptEngines = DependencyManager::get<ScriptEngines>(); | |
| 117 | 119 | // Edit > Stop All Scripts... [advanced] |
| 118 | − addActionToQMenuAndActionHash(editMenu, MenuOption::StopAllScripts, 0, qApp, SLOT(stopAllScripts()), | |
| 120 | + addActionToQMenuAndActionHash(editMenu, MenuOption::StopAllScripts, 0, | |
| 121 | + scriptEngines.data(), SLOT(stopAllScripts()), | |
| 119 | 122 | QAction::NoRole, UNSPECIFIED_POSITION, "Advanced"); |
| 120 | 123 | |
| 121 | 124 | // Edit > Reload All Scripts... [advanced] |
| 122 | 125 | addActionToQMenuAndActionHash(editMenu, MenuOption::ReloadAllScripts, Qt::CTRL | Qt::Key_R, |
| 123 | − qApp, SLOT(reloadAllScripts()), | |
| 126 | + scriptEngines.data(), SLOT(reloadAllScripts()), | |
| 124 | 127 | QAction::NoRole, UNSPECIFIED_POSITION, "Advanced"); |
| 125 | 128 | |
| 126 | 129 | // Edit > Scripts Editor... [advanced] |