summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2010-04-12 12:36:31 (GMT)
committerKevin Smith <git@kismith.co.uk>2010-04-12 12:36:31 (GMT)
commited38ddf609f1190ecb2aebb5e23ead115e6a6a8d (patch)
treef6ae4c87da2e27951b2819355b7b8aaa279b45e9 /Swift/Controllers
parent13254e6c8e69bf5f45b1ad50d3d3483bb46f0179 (diff)
downloadswift-ed38ddf609f1190ecb2aebb5e23ead115e6a6a8d.zip
swift-ed38ddf609f1190ecb2aebb5e23ead115e6a6a8d.tar.bz2
Don't segfault on exit
Diffstat (limited to 'Swift/Controllers')
-rw-r--r--Swift/Controllers/MainController.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index 1aaf1fe..1c83d1d 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -62,12 +62,22 @@ static const String CLIENT_NODE = "http://swift.im";
MainController::MainController(ChatWindowFactory* chatWindowFactory, MainWindowFactory *mainWindowFactory, LoginWindowFactory *loginWindowFactory, TreeWidgetFactory *treeWidgetFactory, EventWindowFactory* eventWindowFactory, SettingsProvider *settings, Application* application, SystemTray* systemTray, SoundPlayer* soundPlayer, XMLConsoleWidgetFactory* xmlConsoleWidgetFactory, ChatListWindowFactory* chatListWindowFactory)
- : timerFactory_(&boostIOServiceThread_.getIOService()), idleDetector_(&idleQuerier_, &timerFactory_, 100), client_(NULL), presenceSender_(NULL), chatWindowFactory_(chatWindowFactory), mainWindowFactory_(mainWindowFactory), loginWindowFactory_(loginWindowFactory), treeWidgetFactory_(treeWidgetFactory), settings_(settings), xmppRosterController_(NULL), rosterController_(NULL), loginWindow_(NULL), clientVersionResponder_(NULL), nickResolver_(NULL), discoResponder_(NULL) {
+ : timerFactory_(&boostIOServiceThread_.getIOService()), idleDetector_(&idleQuerier_, &timerFactory_, 100), chatWindowFactory_(chatWindowFactory), mainWindowFactory_(mainWindowFactory), loginWindowFactory_(loginWindowFactory), treeWidgetFactory_(treeWidgetFactory), settings_(settings), loginWindow_(NULL) {
application_ = application;
presenceOracle_ = NULL;
avatarManager_ = NULL;
chatsManager_ = NULL;
eventController_ = NULL;
+ eventWindowController_ = NULL;
+ nickResolver_ = NULL;
+ avatarManager_ = NULL;
+ rosterController_ = NULL;
+ xmppRosterController_ = NULL;
+ clientVersionResponder_ = NULL;
+ discoResponder_ = NULL;
+ presenceSender_ = NULL;
+ client_ = NULL;
+
eventWindowFactory_ = eventWindowFactory;
chatListWindowFactory_ = chatListWindowFactory;
uiEventStream_ = new UIEventStream();