From 6a81c021e18365c15703db868a9904eb196c7e03 Mon Sep 17 00:00:00 2001
From: mathieui <mathieui@mathieui.net>
Date: Mon, 21 Jan 2013 19:45:19 +0100
Subject: Fix it for real.
---
src/core.py | 9 ++++++---
src/tabs.py | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/core.py b/src/core.py
index e06007bf..7b536faa 100644
--- a/src/core.py
+++ b/src/core.py
@@ -1705,9 +1705,12 @@ class Core(object):
if password is None: # try to use a saved password
password = config.get_by_tabname('password', None, room, fallback=False)
if tab and not tab.joined:
- delta = datetime.now() - tab.last_connection
- seconds = delta.seconds + delta.days * 24 * 3600 if tab.last_connection is not None else 0
- seconds = int(seconds)
+ if tab.last_connection:
+ delta = datetime.now() - tab.last_connection
+ seconds = delta.seconds + delta.days * 24 * 3600 if tab.last_connection is not None else 0
+ seconds = int(seconds)
+ else:
+ seconds = 0
muc.join_groupchat(self.xmpp, room, nick, password,
histo_length, current_status.message, current_status.show, seconds=seconds)
if not tab:
diff --git a/src/tabs.py b/src/tabs.py
index 4b1a695b..2e39988d 100644
--- a/src/tabs.py
+++ b/src/tabs.py
@@ -789,7 +789,7 @@ class MucTab(ChatTab):
last_message = self._text_buffer.last_message
if last_message:
return last_message.time
- return 0
+ return None
@refresh_wrapper.always
def go_to_next_hl(self):
--
cgit v1.2.3