Mir

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

Proposed by Alan Griffiths on 2017-09-27
Status: Merged
Approved by: Chris Halse Rogers on 2017-09-27
Approved revision: 4274
Merged at revision: 4274
Proposed branch: lp:~alan-griffiths/mir/fix-1719878
Merge into: lp:mir
Diff against target: 23 lines (+5/-1)
1 file modified
src/server/display_server.cpp (+5/-1)
To merge this branch: bzr merge lp:~alan-griffiths/mir/fix-1719878
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Approve on 2017-09-27
Chris Halse Rogers 2017-09-27 Approve on 2017-09-27
Review via email: mp+331434@code.launchpad.net

Commit message

Restart Wayland on resume. (LP: #1719878)

To post a comment you must log in.
Chris Halse Rogers (raof) wrote :

Ahem. Yes.

review: Approve
Mir CI Bot (mir-ci-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/server/display_server.cpp'
2--- src/server/display_server.cpp 2017-09-07 05:58:13 +0000
3+++ src/server/display_server.cpp 2017-09-27 17:41:59 +0000
4@@ -80,7 +80,7 @@
5 [this] { wayland_connector->stop(); },
6 [this] { wayland_connector->start(); });
7
8- auto prompt = try_but_revert_if_unwinding(
9+ auto prompt = try_but_revert_if_unwinding(
10 [this] { prompt_connector->stop(); },
11 [&, this] { prompt_connector->start(); });
12
13@@ -140,6 +140,10 @@
14 [this] { prompt_connector->start(); },
15 [&, this] { prompt_connector->stop(); });
16
17+ auto wayland = try_but_revert_if_unwinding(
18+ [this] { wayland_connector->start(); },
19+ [&, this] { wayland_connector->stop(); });
20+
21 connector->start();
22 }
23 catch(std::runtime_error const&)

Subscribers

People subscribed via source and target branches