QtMir

Merge lp:~aacid/qtmir/no_double_search into lp:qtmir

Proposed by Albert Astals Cid on 2015-09-29

Status:	Merged
Approved by:	Gerry Boland on 2015-10-15
Approved revision:	374
Merged at revision:	387
Proposed branch:	lp:~aacid/qtmir/no_double_search
Merge into:	lp:qtmir
Diff against target:	12 lines (+1/-1) 1 file modified src/modules/Unity/Application/mirsurfacemanager.cpp (+1/-1)
To merge this branch:	bzr merge lp:~aacid/qtmir/no_double_search
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Daniel d'Andrada (community)			Abstain on 2015-10-21
Gerry Boland		2015-09-29	Approve on 2015-10-12
PS Jenkins bot	continuous-integration		Approve on 2015-10-09
Review via email: mp+272707@code.launchpad.net

Don't search for the element again

* Are there any related MPs required for this MP to build/function as expected?
No

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

Gerry Boland (gerboland) wrote on 2015-09-29:

LGTM

review: Approve

PS Jenkins bot (ps-jenkins) wrote on 2015-09-29:

review: Approve (continuous-integration)

Daniel d'Andrada (dandrader) wrote on 2015-10-09:

This left qmlSurface empty (nullptr), causing bug 1504537.

review: Disapprove

lp:~aacid/qtmir/no_double_search updated on 2015-10-09

PS Jenkins bot (ps-jenkins) wrote on 2015-10-09:

review: Approve (continuous-integration)

Gerry Boland (gerboland) wrote on 2015-10-12:

Yeah, works fine. Shoulda caught previous error, apologies

review: Approve

Daniel d'Andrada (dandrader) on 2015-10-21:

review: Abstain

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'src/modules/Unity/Application/mirsurfacemanager.cpp'
2	--- src/modules/Unity/Application/mirsurfacemanager.cpp 2015-08-31 09:51:28 +0000
3	+++ src/modules/Unity/Application/mirsurfacemanager.cpp 2015-10-09 15:35:18 +0000
4	@@ -145,7 +145,7 @@
5
6	qmlSurface = it.value();
7
8	- m_mirSurfaceToQmlSurfaceHash.remove(m_mirSurfaceToQmlSurfaceHash.key(qmlSurface));
9	+ m_mirSurfaceToQmlSurfaceHash.erase(it);
10	} else {
11	qCritical() << "MirSurfaceManager::onSessionDestroyingSurface: unable to find MirSurface corresponding"
12	<< "to surface=" << surface.get() << "surface.name=" << surface->name().c_str();