summaryrefslogtreecommitdiff
path: root/src/windows.py
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2011-05-04 23:08:58 +0200
committerFlorent Le Coz <louiz@louiz.org>2011-05-04 23:08:58 +0200
commit118a81992dd7ea8ef34eeac565d092f0e5191eb1 (patch)
tree5237d5b1fd8de67b80f7d0739fd9691fc38d51ac /src/windows.py
parentc784deea9c6a3a2d19a6bfe56d2eae92e9c901f5 (diff)
downloadpoezio-118a81992dd7ea8ef34eeac565d092f0e5191eb1.tar.gz
poezio-118a81992dd7ea8ef34eeac565d092f0e5191eb1.tar.bz2
poezio-118a81992dd7ea8ef34eeac565d092f0e5191eb1.tar.xz
poezio-118a81992dd7ea8ef34eeac565d092f0e5191eb1.zip
Fix /recolor correctly, and also fixes #2158
Diffstat (limited to 'src/windows.py')
-rw-r--r--src/windows.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/windows.py b/src/windows.py
index 53cd0781..ea4bfca2 100644
--- a/src/windows.py
+++ b/src/windows.py
@@ -576,10 +576,10 @@ class TextWin(Win):
while txt != '':
(txt, cutted_txt) = cut_text(txt, self.width-offset-1)
if first:
- if message.user:
- color = message.user.color
- elif message.nick_color:
+ if message.nick_color:
color = message.nick_color
+ elif message.user:
+ color = message.user.color
else:
color = None
else: