Merge lp:~alan-griffiths/miral/workaround-1667645 into lp:miral

Proposed by Alan Griffiths on 2017-02-24
Status: Merged
Merged at revision: 520
Proposed branch: lp:~alan-griffiths/miral/workaround-1667645
Merge into: lp:miral
Diff against target: 18 lines (+7/-1)
1 file modified
miral-shell/decoration_provider.cpp (+7/-1)
To merge this branch: bzr merge lp:~alan-griffiths/miral/workaround-1667645
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) 2017-02-24 Approve on 2017-02-24
Review via email: mp+318237@code.launchpad.net

Commit message

[libmiral] Workaround for server crash (LP: #1667645)

To post a comment you must log in.
Brandon Schaefer (brandontschaefer) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'miral-shell/decoration_provider.cpp'
--- miral-shell/decoration_provider.cpp 2017-02-21 11:54:06 +0000
+++ miral-shell/decoration_provider.cpp 2017-02-24 15:00:30 +0000
@@ -271,7 +271,13 @@
271271
272 enqueue_work([this]272 enqueue_work([this]
273 {273 {
274 wallpaper.erase(begin(wallpaper), end(wallpaper));274 {
275#if MIR_CLIENT_API_VERSION < MIR_VERSION_NUMBER(0, 26, 2)
276 auto const Workaround_lp_1667645 =
277 WindowSpec::for_normal_window(connection, 100, 100, mir_pixel_format_xrgb_8888).create_window();
278#endif
279 wallpaper.erase(begin(wallpaper), end(wallpaper));
280 }
275 connection.reset();281 connection.reset();
276 stop_work();282 stop_work();
277 });283 });

Subscribers

People subscribed via source and target branches