Merge lp:~alan-griffiths/mir/fix-1719878 into lp:mir

[Alan Griffiths]

Restart Wayland on resume. (LP: #1719878)

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:4275
https://mir-jenkins.ubuntu.com/job/mir-ci/3700/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/5072/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5308
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5296
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5296
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5296

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3700/rebuild

review: Needs Fixing (continuous-integration)

[Chris Halse Rogers (raof)]

Ahem. Yes.

review: Approve

[Mir CI Bot (mir-ci-bot)]

review: Approve (continuous-integration)

=== modified file 'src/server/display_server.cpp'
--- src/server/display_server.cpp	2017-09-07 05:58:13 +0000
+++ src/server/display_server.cpp	2017-09-27 17:41:59 +0000
@@ -80,7 +80,7 @@
                 [this] { wayland_connector->stop(); },
                 [this] { wayland_connector->start(); });
 
-	    auto prompt = try_but_revert_if_unwinding(
+            auto prompt = try_but_revert_if_unwinding(
                 [this] { prompt_connector->stop(); },
                 [&, this] { prompt_connector->start(); });
 
@@ -140,6 +140,10 @@
                 [this] { prompt_connector->start(); },
                 [&, this] { prompt_connector->stop(); });
 
+            auto wayland = try_but_revert_if_unwinding(
+                [this] { wayland_connector->start(); },
+                [&, this] { wayland_connector->stop(); });
+
             connector->start();
         }
         catch(std::runtime_error const&)