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
1=== modified file 'miral-shell/decoration_provider.cpp'
2--- miral-shell/decoration_provider.cpp 2017-02-21 11:54:06 +0000
3+++ miral-shell/decoration_provider.cpp 2017-02-24 15:00:30 +0000
4@@ -271,7 +271,13 @@
5
6 enqueue_work([this]
7 {
8- wallpaper.erase(begin(wallpaper), end(wallpaper));
9+ {
10+#if MIR_CLIENT_API_VERSION < MIR_VERSION_NUMBER(0, 26, 2)
11+ auto const Workaround_lp_1667645 =
12+ WindowSpec::for_normal_window(connection, 100, 100, mir_pixel_format_xrgb_8888).create_window();
13+#endif
14+ wallpaper.erase(begin(wallpaper), end(wallpaper));
15+ }
16 connection.reset();
17 stop_work();
18 });

Subscribers

People subscribed via source and target branches