nosignal/nosignal-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: null check qmlEngine() in CUtils::saveItem

Browse source 
qmlEngine(this) can return nullptr during engine shutdown,
causing a null pointer dereference in the async callback.
This commit is contained in:
2 * r + 2 * t 2026-03-24 01:52:44 +11:00
parent b85b0e7afb
commit d5c6e98126
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
plugin/src/Caelestia/cutils.cpp
View file

@ -75,13 +75,20 @@ void CUtils::saveItem(QQuickItem* target, const QUrl& path, const QRect& rect, Q
QObject::connect(watcher, &QFutureWatcher<bool>::finished, this, [=]() { QObject::connect(watcher, &QFutureWatcher<bool>::finished, this, [=]() {
if (watcher->result()) { if (watcher->result()) {
if (onSaved.isCallable()) { if (onSaved.isCallable()) {
onSaved.call( QJSValueList args = { QJSValue(path.toLocalFile()) };
{ QJSValue(path.toLocalFile()), engine->toScriptValue(QVariant::fromValue(path)) }); if (engine) {
args << engine->toScriptValue(QVariant::fromValue(path));
}
onSaved.call(args);
} }
} else { } else {
qWarning() << "CUtils::saveItem: failed to save" << path; qWarning() << "CUtils::saveItem: failed to save" << path;
if (onFailed.isCallable()) { if (onFailed.isCallable()) {
if (engine) {
onFailed.call({ engine->toScriptValue(QVariant::fromValue(path)) }); onFailed.call({ engine->toScriptValue(QVariant::fromValue(path)) });
} else {
onFailed.call();
}
} }
} }
watcher->deleteLater(); watcher->deleteLater();