diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-03-30 02:05:40 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-04-01 03:11:26 +0300 |
| commit | a39f63cdfa5ce15b22f294a8bb1db3a036ce462d (patch) | |
| tree | 4de71bde947cae0cf5d3196cd97e82f5bc537c5c /src/gui/widgets | |
| parent | 02ec4369acfbf261236631e20dbb76131e7889f8 (diff) | |
| download | plus-a39f63cdfa5ce15b22f294a8bb1db3a036ce462d.tar.gz plus-a39f63cdfa5ce15b22f294a8bb1db3a036ce462d.tar.bz2 plus-a39f63cdfa5ce15b22f294a8bb1db3a036ce462d.tar.xz plus-a39f63cdfa5ce15b22f294a8bb1db3a036ce462d.zip | |
One part of fixes after auto checking.
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/avatarlistbox.cpp | 17 | ||||
| -rw-r--r-- | src/gui/widgets/chattab.h | 2 |
2 files changed, 9 insertions, 10 deletions
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp index 749837f7d..b4fc4fad0 100644 --- a/src/gui/widgets/avatarlistbox.cpp +++ b/src/gui/widgets/avatarlistbox.cpp @@ -343,16 +343,15 @@ void AvatarListBox::mousePressed(gcn::MouseEvent &event) { case AVATAR_PLAYER: { - Being* being = actorSpriteManager->findBeingByName( - model->getAvatarAt(selected)->getName(), Being::PLAYER); - if (being) + Avatar *avatar = model->getAvatarAt(selected); + if (avatar) { - viewport->showPopup(being); - } - else - { - viewport->showPlayerPopup( - model->getAvatarAt(selected)->getName()); + Being* being = actorSpriteManager->findBeingByName( + avatar->getName(), Being::PLAYER); + if (being) + viewport->showPopup(being); + else + viewport->showPlayerPopup(avatar->getName()); } break; } diff --git a/src/gui/widgets/chattab.h b/src/gui/widgets/chattab.h index d11a85138..455152693 100644 --- a/src/gui/widgets/chattab.h +++ b/src/gui/widgets/chattab.h @@ -171,7 +171,7 @@ class ChatTab : public Tab friend class WhisperWindow; virtual void setCurrent() - { setFlash(false); } + { setFlash(0); } virtual void handleInput(const std::string &msg); |