Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit dfd02160 authored by Martin Flöser's avatar Martin Flöser

Fix fallback to built-in ui

Summary:
If the lock screen package is not available m_mainQmlPath is an empty
URL. Thus view->setSource won't do anything and the status won't change
to Error. Due to that the fallback was not activated when the lnf
package is missing.

This change also checks whether said variable is empty.

Test Plan: run kscreenlocker_greet in testing mode with manipulated XDG_DATA_DIRS

Reviewers: #plasma

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D16945
parent 552932c8
......@@ -317,7 +317,7 @@ void UnlockApp::desktopResized()
view->setSource(m_mainQmlPath);
// on error, load the fallback lockscreen to not lock the user out of the system
if (view->status() == QQmlComponent::Error) {
if (view->status() != QQmlComponent::Ready) {
static const QUrl fallbackUrl(QUrl(QStringLiteral("qrc:/fallbacktheme/LockScreen.qml")));
qWarning() << "Failed to load lockscreen QML, falling back to built-in locker";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment