mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-26 14:25:45 +03:00
Merge pull request #4850 from nextcloud/bugfix/qml-error-logging-cpp
Prevent crashing when trying to create error-ing QML component in systray.cpp, output error to log
This commit is contained in:
commit
d44d839a26
1 changed files with 12 additions and 2 deletions
|
@ -140,7 +140,12 @@ void Systray::create()
|
|||
}
|
||||
|
||||
QQmlComponent trayWindowComponent(_trayEngine, QStringLiteral("qrc:/qml/src/gui/tray/Window.qml"));
|
||||
_trayWindow.reset(qobject_cast<QQuickWindow*>(trayWindowComponent.create()));
|
||||
|
||||
if(trayWindowComponent.isError()) {
|
||||
qCWarning(lcSystray) << trayWindowComponent.errorString();
|
||||
} else {
|
||||
_trayWindow.reset(qobject_cast<QQuickWindow*>(trayWindowComponent.create()));
|
||||
}
|
||||
}
|
||||
hideWindow();
|
||||
emit activated(QSystemTrayIcon::ActivationReason::Unknown);
|
||||
|
@ -260,8 +265,13 @@ void Systray::createCallDialog(const Activity &callNotification, const AccountSt
|
|||
};
|
||||
|
||||
const auto callDialog = new QQmlComponent(_trayEngine, QStringLiteral("qrc:/qml/src/gui/tray/CallNotificationDialog.qml"));
|
||||
callDialog->createWithInitialProperties(initialProperties);
|
||||
|
||||
if(callDialog->isError()) {
|
||||
qCWarning(lcSystray) << callDialog->errorString();
|
||||
return;
|
||||
}
|
||||
|
||||
callDialog->createWithInitialProperties(initialProperties);
|
||||
_callsAlreadyNotified.insert(callNotification._id);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue