Skip to content

scripting: fix value of g_scriptingEngine when emitting aboutToBeDestroyed #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
taj-ny merged 1 commit into from
Jun 15, 2026
Merged

scripting: fix value of g_scriptingEngine when emitting aboutToBeDestroyed #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions src/libinputactions/config/ConfigLoader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,19 +66,29 @@ void ConfigLoader::loadEmpty()

bool ConfigLoader::load(const ConfigLoadSettings &settings)
{
auto scriptingEngine = g_scriptingEngine;
static const auto destroyEngine = [](std::shared_ptr<ScriptingEngine> &engine) {
auto oldEngine = g_scriptingEngine;
g_scriptingEngine = engine;
if (auto *coreModule = engine->coreModule()) {
Q_EMIT coreModule->config()->aboutToBeDestroyed();
}
g_scriptingEngine = oldEngine;
engine.reset();
};

auto currentEngine = g_scriptingEngine;
try {
qCDebug(INPUTACTIONS, "Reloading config");
const auto rawConfig = settings.config.value_or(g_configProvider->currentConfig());

g_configIssueManager = std::make_shared<ConfigIssueManager>(rawConfig);
g_scriptingEngine = std::make_shared<ScriptingEngine>();
auto config = createConfig(rawConfig);
scriptingEngine.reset();
destroyEngine(currentEngine);
activateConfig(std::move(config), true);
} catch (const ConfigException &e) {
g_scriptingEngine = scriptingEngine;
destroyEngine(g_scriptingEngine);
g_scriptingEngine = currentEngine;
g_configIssueManager->addIssue(e);
}

Expand Down
3 changes: 0 additions & 3 deletions src/libinputactions/scripting/ScriptingEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

#include "ScriptingEngine.h"
#include "Promise.h"
#include "modules/core/Config.h"
#include "modules/core/CoreModule.h"
#include "modules/fs/File.h"
#include <libinputactions/InputActionsMain.h>
Expand All @@ -44,8 +43,6 @@ ScriptingEngine::~ScriptingEngine()
return;
}

Q_EMIT coreModule()->config()->aboutToBeDestroyed();

QMetaObject::invokeMethod(m_watchdogTimer, "stop", Qt::BlockingQueuedConnection);
m_watchdogTimerThread->quit();
m_watchdogTimerThread->wait();
Expand Down
3 changes: 3 additions & 0 deletions src/libinputactions/scripting/ScriptingEngine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,9 @@ private slots:
QTimer m_watchdogRestartTimer;
};

/**
* The engine in which code is currently being executed. Safe to use in C++ functions called from JS.
*/
inline std::shared_ptr<ScriptingEngine> g_scriptingEngine;

}