Merge lp:~mzanetti/unity8/dont-crash-on-invalid-app into lp:unity8

[Michael Zanetti]

Don't crash when we get an invalid app from ApplicationManager

 * Are there any related MPs required for this MP to build/function as expected? Please list.

Nope

 * Did you perform an exploratory manual test run of your code change and any related functionality?

Yep

 * Did you make sure that your branch does not contain spurious tags?

Yep

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

nope

 * If you changed the UI, has there been a design review?

nope

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:914
http://jenkins.qa.ubuntu.com/job/unity8-ci/3024/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/407
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/62/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/118
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/118/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/871
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/808
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/808/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7521

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3024/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

I think this should go in, crashes are bad, *BUT* I think we should add and enable enough logs (unity-mir has lots of debug but disabled) that we can go look at the logs of someone that has been running the patched for for months and grep for "LauncherModel received an applicationAdded signal, but there's no such application!" and with the logs have enough information to find out what is wrong and what is causing this null application to show up at this level.

[Albert Astals Cid (aacid)]

review: Abstain

[Michael Zanetti (mzanetti)]

I fully agree with Albert.

Gerry, can you take care about enabling the debug prints in unity-mir / qtmir?

[Gerry Boland (gerboland)]

Shouldn't be necessary, but yes good to check

review: Approve

[Gerry Boland (gerboland)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Y
 * Did CI run pass? If not, please explain why.
Y

=== modified file 'plugins/Unity/Launcher/launchermodel.cpp'
--- plugins/Unity/Launcher/launchermodel.cpp	2014-05-13 11:24:48 +0000
+++ plugins/Unity/Launcher/launchermodel.cpp	2014-05-22 12:48:45 +0000
@@ -23,6 +23,8 @@
 
 #include <unity/shell/application/ApplicationInfoInterface.h>
 
+#include <QDebug>
+
 using namespace unity::shell::application;
 
 LauncherModel::LauncherModel(QObject *parent):
@@ -291,6 +293,10 @@
     Q_UNUSED(parent);
 
     ApplicationInfoInterface *app = m_appManager->get(row);
+    if (!app) {
+        qWarning() << "LauncherModel received an applicationAdded signal, but there's no such application!";
+        return;
+    }
 
     bool found = false;
     Q_FOREACH(LauncherItem *item, m_list) {