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

[Albert Astals Cid]

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)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:370
http://jenkins.qa.ubuntu.com/job/qtmir-ci/446/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/142
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/142
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/142/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/179
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/179
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/179/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/24

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/446/rebuild

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

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

review: Disapprove

[lp:~aacid/qtmir/no_double_search]

372. By Albert Astals Cid on 2015-10-09

Merge

373. By Albert Astals Cid on 2015-10-09

be spacing perfect

374. By Albert Astals Cid on 2015-10-09

spacing perfect i say!

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:374
http://jenkins.qa.ubuntu.com/job/qtmir-ci/494/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/190
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/190
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/190/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/227
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/227
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/227/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/72

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/494/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

Yeah, works fine. Shoulda caught previous error, apologies

review: Approve

[Daniel d'Andrada (dandrader)]

review: Abstain

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