Merge lp:~alan-griffiths/miral/fix-initialization-order into lp:miral

[Alan Griffiths]

[libmiral] Fix initialization order so that policies can allocate workspaces when constructed

[libmiral] Fix initialization order so that policies can allocate workspaces when constructed

I only started seeing errors today, but this problem has clearly existed a while. Weird.

[Gerry Boland (gerboland)]

review: Approve

[Andreas Pokorny (andreas-pokorny)]

ok

review: Approve

=== modified file 'miral/basic_window_manager.h'
--- miral/basic_window_manager.h	2017-02-21 15:02:23 +0000
+++ miral/basic_window_manager.h	2017-02-27 12:42:15 +0000
@@ -165,6 +165,16 @@
     mir::shell::FocusController* const focus_controller;
     std::shared_ptr<mir::shell::DisplayLayout> const display_layout;
     std::shared_ptr<mir::shell::PersistentSurfaceStore> const persistent_surface_store;
+
+    // Workspaces may die without any sync with the BWM mutex
+    struct DeadWorkspaces
+    {
+        std::mutex mutable dead_workspaces_mutex;
+        std::vector<std::weak_ptr<Workspace>> workspaces;
+    };
+
+    std::shared_ptr<DeadWorkspaces> const dead_workspaces{std::make_shared<DeadWorkspaces>()};
+
     std::unique_ptr<WindowManagementPolicy> const policy;
     WorkspacePolicy* const workspace_policy;
 
@@ -185,15 +195,6 @@
 
     wwbimap_t workspaces_to_windows;
 
-    // Workspaces may die without any sync with the BWM mutex
-    struct DeadWorkspaces
-    {
-        std::mutex mutable dead_workspaces_mutex;
-        std::vector<std::weak_ptr<Workspace>> workspaces;
-    };
-
-    std::shared_ptr<DeadWorkspaces> const dead_workspaces{std::make_shared<DeadWorkspaces>()};
-
     struct Locker;
 
     void update_event_timestamp(MirKeyboardEvent const* kev);