From bb6fa7cb46d78234c9712945e46da6e51c821776 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Cort=C3=A9z?= Date: Wed, 19 Aug 2015 05:28:56 -0500 Subject: [PATCH] logout() now removes database for the session --- src/controller/mainController.py | 4 +++- src/sessionmanager/session.py | 3 ++- windows-dependencies | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/controller/mainController.py b/src/controller/mainController.py index e292d748..025d23bb 100644 --- a/src/controller/mainController.py +++ b/src/controller/mainController.py @@ -263,6 +263,7 @@ class Controller(object): for i in session_.sessions: if session_.sessions[i].session_id == session_id: session = session_.sessions[i] session.login() + session.db = dict() self.create_buffers(session, False) self.start_buffers(session) @@ -394,7 +395,8 @@ class Controller(object): self.destroy_buffer("%s-searchterm" % (i,), user) for i in session.settings["other_buffers"]["trending_topic_buffers"]: self.destroy_buffer("%s_tt" % (i,), user) - + session.db = None + def destroy_buffer(self, buffer_name, account): buffer = self.search_buffer(buffer_name, account) if buffer == None: return diff --git a/src/sessionmanager/session.py b/src/sessionmanager/session.py index 84e26264..64065301 100644 --- a/src/sessionmanager/session.py +++ b/src/sessionmanager/session.py @@ -119,7 +119,8 @@ class Session(object): # self.settings = None def init_sound(self): - self.sound = sound.soundSystem(self.settings["sound"]) + try: self.sound = sound.soundSystem(self.settings["sound"]) + except: pass @_require_configuration def login(self, verify_credentials=True): diff --git a/windows-dependencies b/windows-dependencies index 4d106f04..0f65f42c 160000 --- a/windows-dependencies +++ b/windows-dependencies @@ -1 +1 @@ -Subproject commit 4d106f04f7e6d2f9e160aca54ce107efb46ee099 +Subproject commit 0f65f42c9f752396b0567e597d96c0ab8a5a53f8