Fix crash in _add_log when buddy is None and make _add_log more robust

1 files changed, 9 insertions, 0 deletions

diff --git a/pippy_app.py b/pippy_app.py
index 6ee0a4f..7be5cf2 100644
--- a/pippy_app.py
+++ b/pippy_app.py
@@ -321,6 +321,7 @@ class Chat(ViewSourceActivity):
             color_stroke = COLOR_BLACK.get_int()
             color_fill = COLOR_WHITE.get_int()
             text_color = COLOR_BLACK.get_int()
+            color = '#000000,#FFFFFF'
         self._add_log(nick, color, text, status_message)
 
         # Check for Right-To-Left languages:
@@ -457,6 +458,14 @@ class Chat(ViewSourceActivity):
         text -- string, body of message
         status_message -- boolean
         """
+        if not nick:
+            nick = '???'
+        if not color:
+            color = '#000000,#FFFFFF'
+        if not text:
+            text = '-'
+        if not status_message:
+            status_message = False
         self._chat_log += '%s\t%s\t%s\t%d\t%s\n' % (
             datetime.strftime(datetime.now(), '%b %d %H:%M:%S'),
             nick, color, status_message, text)