Unity

Merge lp:~azzar1/unity/fix-1039451-hud-warning into lp:unity

  1. fix-1039451-hud-warning
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Tim Penhey
Approved revision: no longer in the source branch.
Merged at revision: 2604
Proposed branch: lp:~azzar1/unity/fix-1039451-hud-warning
Merge into: lp:unity
Diff against target: 14 lines (+2/-2)
1 file modified
UnityCore/Hud.cpp (+2/-2)
To merge this branch: bzr merge lp:~azzar1/unity/fix-1039451-hud-warning
Reviewer Review Type Date Requested Status
Tim Penhey (community) Approve
Review via email: mp+120556@code.launchpad.net

Commit message

Fix annoying warning in UnityCore/Hud.cpp

Description of the change

== Problem ==
WARN unity.hud.hud Hud.cpp:185 Attempted to close the hud connection without starting it.

== Fix ==
Add sanity check. Remove unneeded comment.

== Tests ==
Hud.cpp already has unit and AP tests.

To post a comment you must log in.
Revision history for this message
Tim Penhey (thumper) wrote :

Thanks for this, it was very annoying.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'UnityCore/Hud.cpp'
2--- UnityCore/Hud.cpp 2012-04-16 12:11:01 +0000
3+++ UnityCore/Hud.cpp 2012-08-21 13:05:53 +0000
4@@ -249,8 +249,8 @@
5
6 void Hud::CloseQuery()
7 {
8- //Send close hint to the hud
9- pimpl_->CloseQuery();
10+ if (pimpl_->query_key_)
11+ pimpl_->CloseQuery();
12 }
13
14 }