summaryrefslogtreecommitdiff
path: root/src/gui/whoisonline.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-10-17 22:07:24 +0300
committerAndrei Karas <akaras@inbox.ru>2011-10-17 22:07:24 +0300
commitd14bb7a27ee23cc83b3af1db2f1976eaaa55d78a (patch)
tree5f128768c66436eefd70632f02889607596609d4 /src/gui/whoisonline.cpp
parentf1e92aca00a4859047e83fab76220767b9a2f814 (diff)
parente93e6beb456d105987da3190c2a80847b6900081 (diff)
downloadplus-stripped1.1.10.16.tar.gz
plus-stripped1.1.10.16.tar.bz2
plus-stripped1.1.10.16.tar.xz
plus-stripped1.1.10.16.zip
Merge branch 'master' into strippedstripped1.1.10.16
Conflicts: data/fonts/mplus-1p-bold.ttf data/fonts/mplus-1p-regular.ttf
Diffstat (limited to 'src/gui/whoisonline.cpp')
-rw-r--r--src/gui/whoisonline.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp
index a14e99afc..3fb63a105 100644
--- a/src/gui/whoisonline.cpp
+++ b/src/gui/whoisonline.cpp
@@ -278,6 +278,7 @@ void WhoIsOnline::loadList()
break;
case PlayerRelation::DISREGARDED:
+ case PlayerRelation::BLACKLISTED:
disregard.push_back(prepareNick(nick, level, "8"));
break;
@@ -492,6 +493,7 @@ void WhoIsOnline::logic()
setCaption(_("Who Is Online - error"));
mUpdateButton->setEnabled(true);
mUpdateTimer = cur_time + 240;
+ updateSize();
break;
case UPDATE_LIST:
if (mDownloadComplete == true)