git.iko.soy/unity8
on xenial help sign in
Don't use appInfo after checking it was null
1213691Albert Astals Cid
plugins/Unity/Launcher/launchermodel.cpp+10−9
compare with xenial
unifiedsplit
@@ -207,16 +207,17 @@ void LauncherModel::quickListActionInvoked(const QString &appId, int actionIndex
207 }
207 }
208 } else if (actionId.startsWith(QStringLiteral("surface_"))){
208 } else if (actionId.startsWith(QStringLiteral("surface_"))){
209 ApplicationInfoInterface *appInfo = m_appManager->findApplication(appId);
209 ApplicationInfoInterface *appInfo = m_appManager->findApplication(appId);
210− if (!appInfo) {
210+ if (appInfo) {
211− qWarning() << "App for" << appId << "not found in launcher. Cannot invoke quicklist action";
212− }
213− for (int i = 0; i < appInfo->surfaceList()->count(); ++i) {
211+ for (int i = 0; i < appInfo->surfaceList()->count(); ++i) {
214− MirSurfaceInterface *iface = appInfo->surfaceList()->get(i);
212+ MirSurfaceInterface *iface = appInfo->surfaceList()->get(i);
215− QString id = actionId;
213+ QString id = actionId;
216− id.remove(QRegExp("^surface_"));
214+ id.remove(QRegExp("^surface_"));
217− if (id == iface->persistentId()) {
215+ if (id == iface->persistentId()) {
218− iface->activate();
216+ iface->activate();
217+ }
219 }
218 }
219+ } else {
220+ qWarning() << "App for" << appId << "not found in launcher. Cannot invoke quicklist action";
220 }
221 }
221 // Nope, we don't know this action, let the backend forward it to the application
222 // Nope, we don't know this action, let the backend forward it to the application
222 } else {
223 } else {