Merge lp:~ricmm/unity-mir/catch-starting-failure into lp:unity-mir

[Ricardo Mendoza]

Catch application crashes when Application status is still ::Starting.

 * Are there any related MPs required for this MP to build/function as expected? Please list.
No
 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
No

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:171
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/237/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/101
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/101/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/100

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/237/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

LGTM

review: Approve

[Gerry Boland (gerboland)]

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

review: Approve

=== modified file 'src/modules/Unity/Application/application_manager.cpp'
--- src/modules/Unity/Application/application_manager.cpp	2014-01-16 11:57:16 +0000
+++ src/modules/Unity/Application/application_manager.cpp	2014-01-30 11:05:03 +0000
@@ -370,7 +370,7 @@
             removeApplication = true;
         }
 
-        if (application->state() == Application::Running) {
+        if (application->state() == Application::Running || application->state() == Application::Starting) {
             // Application probably crashed, else OOM killer struck. Either way state wasn't saved
             // so just remove application
             removeApplication = true;
@@ -574,9 +574,16 @@
     // in case application closed not by hand of shell, check again here:
     Application* application = findApplicationWithSession(session);
     if (application) {
-        application->setState(Application::Stopped);
-        application->setSession(nullptr);
-        m_dbusWindowStack->WindowDestroyed(0, application->appId());
+        bool removeApplication = true;
+
+        if (application->state() != Application::Starting) {
+            application->setState(Application::Stopped);
+            application->setSession(nullptr);
+            m_dbusWindowStack->WindowDestroyed(0, application->appId());
+            if (application != m_focusedApplication) {
+	            removeApplication = false;
+            }
+        }
 
         if (m_mainStageApplication == application)
             m_mainStageApplication = nullptr;
@@ -584,7 +591,7 @@
         if (m_sideStageApplication == application)
             m_sideStageApplication = nullptr;
 
-        if (application == m_focusedApplication) {
+        if (removeApplication) {
             // TODO(greyback) What to do?? Focus next app, or unfocus everything??
             m_focusedApplication = NULL;
             remove(application);