1
=== modified file 'src/server/shell/system_compositor_window_manager.cpp'
2
--- src/server/shell/system_compositor_window_manager.cpp	2016-01-29 08:18:22 +0000
3
+++ src/server/shell/system_compositor_window_manager.cpp	2016-02-09 14:47:27 +0000
4
@@ -120,6 +120,8 @@
5
120
    std::weak_ptr<ms::Surface> const& surface)
120
    std::weak_ptr<ms::Surface> const& surface)
6
121
{
121
{
7
122
    session->destroy_surface(surface);
122
    session->destroy_surface(surface);
8
123
9
124
    std::lock_guard<decltype(mutex)> lock{mutex};
10
123
    output_map.erase(surface);
125
    output_map.erase(surface);
11
124
}
126
}
12
125
127
Status:	Merged
Approved by:	Alan Griffiths on 2016-02-10
Approved revision:	no longer in the source branch.
Merged at revision:	3300
Proposed branch:	lp:~alan-griffiths/mir/fix-SystemCompositorWindowManager-remove_surface
Merge into:	lp:mir
Diff against target:	11 lines (+2/-0) 1 file modified src/server/shell/system_compositor_window_manager.cpp (+2/-0)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/fix-SystemCompositorWindowManager-remove_surface
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Kevin DuBois (community)		2016-02-09	Approve on 2016-02-09
PS Jenkins bot (community)	continuous-integration		Approve on 2016-02-09
Mir CI Bot	continuous-integration		Approve on 2016-02-09
Review via email: mp+285492@code.launchpad.net
1	=== modified file 'src/server/shell/system_compositor_window_manager.cpp'
2	--- src/server/shell/system_compositor_window_manager.cpp 2016-01-29 08:18:22 +0000
3	+++ src/server/shell/system_compositor_window_manager.cpp 2016-02-09 14:47:27 +0000
4	@@ -120,6 +120,8 @@
5	120	std::weak_ptr<ms::Surface> const& surface)	120	std::weak_ptr<ms::Surface> const& surface)
6	121	{	121	{
7	122	session->destroy_surface(surface);	122	session->destroy_surface(surface);
8			123
9			124	std::lock_guard<decltype(mutex)> lock{mutex};
10	123	output_map.erase(surface);	125	output_map.erase(surface);
11	124	}	126	}
12	125		127