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

[Alan Griffiths]

[miral-shell] Handle a titlebar decoration being deleted before it is fully created and painted for the first time.

[Cemil Azizoglu (cemil-azizoglu)]

ok

review: Approve

[Brandon Schaefer (brandontschaefer)]

lgtm

review: Approve

=== modified file 'miral-shell/decoration_provider.cpp'
--- miral-shell/decoration_provider.cpp	2017-03-08 10:19:10 +0000
+++ miral-shell/decoration_provider.cpp	2017-03-15 12:40:13 +0000
@@ -401,11 +401,25 @@
                  });
         }
 
-        enqueue_work([this, window]
-            {
-                std::lock_guard<decltype(mutex)> lock{mutex};
-                window_to_titlebar.erase(window);
-            });
+        if (data->titlebar.load())
+        {
+            enqueue_work([this, window]
+                {
+                    std::lock_guard<decltype(mutex)> lock{mutex};
+                    window_to_titlebar.erase(window);
+                });
+        }
+        else
+        {
+            data->on_create = [this, window](MirWindow*)
+                {
+                    enqueue_work([this, window]
+                        {
+                            std::lock_guard<decltype(mutex)> lock{mutex};
+                            window_to_titlebar.erase(window);
+                        });
+                };
+        }
     }
 }