fixed #1482

2 files changed, 6 insertions, 7 deletions

diff --git a/src/gui.py b/src/gui.py
index 8b5b74ea..a5563cc9 100644
--- a/src/gui.py
+++ b/src/gui.py
@@ -61,7 +61,7 @@ class Gui(object):
         self.muc = muc
 
         self.commands = {
-            'help': (self.command_help, _('That.')),
+            'help': (self.command_help, u'\_o< KOIN KOIN KOIN'),
             'join': (self.command_join, _("""Usage: /join [room_name][/nick]
 [password]\nJoin: Join the specified room. You can specify a nickname after a
  slash (/). If no nickname is specified, you will use the default_nick in the
@@ -322,6 +322,8 @@ Avail: Sets your availability to available and (optional) sets your status
         Display the error on the room window
         """
         room = self.get_room_by_name(room)
+        if not error:
+            return
         code = error.getAttr('code')
         typ = error.getAttr('type')
         body = error.getTag('text').getData()
diff --git a/src/window.py b/src/window.py
index 6b6ad8db..6334fb2c 100644
--- a/src/window.py
+++ b/src/window.py
@@ -129,11 +129,8 @@ class RoomInfo(Win):
         def compare_room(a, b):
             return a.nb - b.nb
         self.win.erase()
-        try:
-            self.win.addnstr(0, 0, current.name+" [", self.width
-                             ,curses.color_pair(1))
-        except:
-            pass
+        self.win.addnstr(0, 0, current.name+" [", self.width
+                         ,curses.color_pair(1))
         sorted_rooms = sorted(rooms, compare_room)
         for room in sorted_rooms:
             if current == room:
@@ -212,7 +209,7 @@ class TextWin(Win):
                                 txt[:limit], message.color,
                                 offset)
                 lines.append(line)
-                txt = txt[limit+1:]
+                txt = txt[limit:]
                 first = False
         return lines[-len(messages):]# return only the needed number of lines