Trying to fix QtQml/QtScript crashes
Showing the changes to interface/src/Menu.cpp (1 of 47 files). Show all
Unified · Split
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | #include <AudioClient.h> |
| 20 | 20 | #include <CrashHelpers.h> |
| 21 | 21 | #include <DependencyManager.h> |
| 22 | −#include <TabletScriptingInterface.h> | |
| 22 | +#include <ui/TabletScriptingInterface.h> | |
| 23 | 23 | #include <display-plugins/DisplayPlugin.h> |
| 24 | 24 | #include <PathUtils.h> |
| 25 | 25 | #include <SettingHandle.h> |
| @@ -121,9 +121,14 @@ Menu::Menu() { · 95 unmodified lines | ||
| 121 | 121 | QAction::NoRole, UNSPECIFIED_POSITION, "Advanced"); |
| 122 | 122 | |
| 123 | 123 | // Edit > Reload All Scripts... [advanced] |
| 124 | − addActionToQMenuAndActionHash(editMenu, MenuOption::ReloadAllScripts, Qt::CTRL | Qt::Key_R, | |
| 125 | − scriptEngines.data(), SLOT(reloadAllScripts()), | |
| 124 | + action = addActionToQMenuAndActionHash(editMenu, MenuOption::ReloadAllScripts, Qt::CTRL | Qt::Key_R, | |
| 125 | + nullptr, nullptr, | |
| 126 | 126 | QAction::NoRole, UNSPECIFIED_POSITION, "Advanced"); |
| 127 | + connect(action, &QAction::triggered, [] { | |
| 128 | + DependencyManager::get<ScriptEngines>()->reloadAllScripts(); | |
| 129 | + DependencyManager::get<OffscreenUi>()->clearCache(); | |
| 130 | + }); | |
| 131 | + | |
| 127 | 132 | |
| 128 | 133 | // Edit > Console... [advanced] |
| 129 | 134 | addActionToQMenuAndActionHash(editMenu, MenuOption::Console, Qt::CTRL | Qt::ALT | Qt::Key_J, |