Mir

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

Proposed by Alan Griffiths
Status: Merged
Approved by: Chris Halse Rogers
Approved revision: no longer in the source branch.
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
Chris Halse Rogers Approve
Review via email: mp+331434@code.launchpad.net

Commit message

Restart Wayland on resume. (LP: #1719878)

To post a comment you must log in.
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Chris Halse Rogers (raof) wrote :

Ahem. Yes.

review: Approve
Revision history for this message
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
=== 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 @@
80 [this] { wayland_connector->stop(); },80 [this] { wayland_connector->stop(); },
81 [this] { wayland_connector->start(); });81 [this] { wayland_connector->start(); });
8282
83 auto prompt = try_but_revert_if_unwinding(83 auto prompt = try_but_revert_if_unwinding(
84 [this] { prompt_connector->stop(); },84 [this] { prompt_connector->stop(); },
85 [&, this] { prompt_connector->start(); });85 [&, this] { prompt_connector->start(); });
8686
@@ -140,6 +140,10 @@
140 [this] { prompt_connector->start(); },140 [this] { prompt_connector->start(); },
141 [&, this] { prompt_connector->stop(); });141 [&, this] { prompt_connector->stop(); });
142142
143 auto wayland = try_but_revert_if_unwinding(
144 [this] { wayland_connector->start(); },
145 [&, this] { wayland_connector->stop(); });
146
143 connector->start();147 connector->start();
144 }148 }
145 catch(std::runtime_error const&)149 catch(std::runtime_error const&)

Subscribers

People subscribed via source and target branches