Merge lp:~alan-griffiths/miral/fix-1628482 into lp:miral

[Alan Griffiths]

Titlebar example: Separate destroying titlebar surfaces from shutdown to avoid possible deadlock

[Andreas Pokorny (andreas-pokorny)]

So:
     enqueue_work([this]
         {
             {
                 std::lock_guard<decltype(mutex)> lock{mutex};
                 window_to_titlebar.clear();
             }
             connection.reset();
             stop_work();
         });

would fix the problem too?

review: Needs Information

[Alan Griffiths (alan-griffiths)]

> So:
> enqueue_work([this]
> {
> {
> std::lock_guard<decltype(mutex)> lock{mutex};
> window_to_titlebar.clear();
> }
> connection.reset();
> stop_work();
> });
>
> would fix the problem too?

Probably. I haven't tried it.

[Andreas Pokorny (andreas-pokorny)]

ok it does ... I was curious about the source of the dead lock..

review: Approve

=== modified file 'miral-shell/titlebar_provider.cpp'
--- miral-shell/titlebar_provider.cpp	2016-08-10 11:48:02 +0000
+++ miral-shell/titlebar_provider.cpp	2016-09-28 14:11:59 +0000
@@ -74,6 +74,10 @@
         {
             std::lock_guard<decltype(mutex)> lock{mutex};
             window_to_titlebar.clear();
+        });
+
+    enqueue_work([this]
+        {
             connection.reset();
             stop_work();
         });