git.iko.soy/unity8
on xenial help sign in
check if variant is valid to avoid asserting in debug mode when the connection to AccountsService doesn't work for some reason

. Approved by PS Jenkins bot, Albert Astals Cid.

commit2ce782b85de8c169a189a243fe573ee01f82a780 authorMichael Zanetti <michael.zanetti@canonical.com> dateThu 5 Dec 2013, 20:13 (13 years ago) parent8911cef97cd4d9
1 file changed+4−2
compare with xenial
unifiedsplit
plugins/Unity/Launcher/backend/launcherbackend.cpp+4−2
plugins/Unity/Launcher/backend/launcherbackend.cpp+4−2
@@ -183,8 +183,10 @@ void LauncherBackend::syncFromAccounts()
183183
184184 if (m_accounts && !m_user.isEmpty()) {
185185 QVariant variant = m_accounts->getUserProperty(m_user, "com.canonical.unity.AccountsService", "launcher-items");
186− apps = qdbus_cast<QList<QVariantMap>>(variant.value<QDBusArgument>());
187− defaults = isDefaultsItem(apps);
186+ if (variant.isValid() && variant.canConvert<QDBusArgument>()) {
187+ apps = qdbus_cast<QList<QVariantMap>>(variant.value<QDBusArgument>());
188+ defaults = isDefaultsItem(apps);
189+ }
188190 }
189191
190192 if (m_accounts && defaults) { // Checking accounts as it'll be null when !useStorage