Merge lp:~gerboland/unity-mir/fix-shutdown-crash into lp:unity-mir

[Gerry Boland]

InputArea: don't use lambda function as slot, can cause crash on shutdown

Using lambda function as slot can introduce crash as the slot's object deletion is not registered unlike with traditional signal/slot connections. As a result, on signal emission, the lambda can be called on a deleted object.

InputArea: don't use lambda function as slot, can cause crash on shutdown

Using lambda function as slot can introduce crash as the slot's object deletion is not registered unlike with traditional signal/slot connections. As a result, on signal emission, the lambda can be called on a deleted object.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:149
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/164/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/25/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/25/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/25/console

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Fixes!

review: Approve

[Didier Roche-Tolomelli (didrocks)]

Gerry, can you add that to you MP:
diff -u unity-mir-0.1+14.04.20131119/debian/changelog unity-mir-0.1+14.04.20131119/debian/changelog
--- unity-mir-0.1+14.04.20131119/debian/changelog
+++ unity-mir-0.1+14.04.20131119/debian/changelog
@@ -1,3 +1,10 @@
+unity-mir (0.1+14.04.20131119-0ubuntu2) trusty; urgency=low
+
+ * Cherry-pick upstream patch to avoid Unity8 crashing on stop
+ (LP: #1253685)
+
+ -- Didier Roche <email address hidden> Tue, 26 Nov 2013 10:47:29 +0100
+
 unity-mir (0.1+14.04.20131119-0ubuntu1) trusty; urgency=low

   [ Gerry Boland ]

Thanks! :)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/modules/Unity/Application/inputarea.cpp'
--- src/modules/Unity/Application/inputarea.cpp	2013-10-31 12:35:59 +0000
+++ src/modules/Unity/Application/inputarea.cpp	2013-11-26 09:22:16 +0000
@@ -87,7 +87,7 @@
     if (surface) {
         // If surface is destroyed, make sure this InputArea doesn't point to it any more
         // For now, the QML engine owns this object so the MirSurface cannot delete it
-        connect(surface, &MirSurface::destroyed, [this]() { doSetSurface(nullptr); });
+        connect(surface, &MirSurface::destroyed, this, &InputArea::setNullSurface);
     }
 
     if (m_surface) {
@@ -105,6 +105,11 @@
     Q_EMIT surfaceChanged();
 }
 
+void InputArea::setNullSurface()
+{
+    doSetSurface(nullptr);
+}
+
 void InputArea::geometryChanged(const QRectF& newGeometry, const QRectF& oldGeometry)
 {
     DLOG("InputArea::geometryChanged (this=%p)", this);

=== modified file 'src/modules/Unity/Application/inputarea.h'
--- src/modules/Unity/Application/inputarea.h	2013-08-29 14:46:43 +0000
+++ src/modules/Unity/Application/inputarea.h	2013-11-26 09:22:16 +0000
@@ -54,6 +54,7 @@
 private Q_SLOTS:
     void onAscendantChanged();
     void onAscendantGeometryChanged();
+    void setNullSurface();
 
 private:
     void listenToAscendantsChanges();