X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Fqtui.cpp;h=0ae5ceea1ffc7e12e5986b6aa9a105826185bf57;hb=141ed9bef03a341c68acde5c41ac7b7f9e660c66;hp=2a0883608cd507410cf2919a59fc0b78d134e8a9;hpb=2e9492d9ef198bde37da1f858602ab9624c0a12a;p=quassel.git

diff --git a/src/qtui/qtui.cpp b/src/qtui/qtui.cpp
index 2a088360..0ae5ceea 100644
--- a/src/qtui/qtui.cpp
+++ b/src/qtui/qtui.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2010 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -37,8 +37,8 @@
 #  include <QX11Info>
 #endif
 
-QPointer<QtUi> QtUi::_instance = 0;
-QPointer<MainWin> QtUi::_mainWin = 0;
+QtUi *QtUi::_instance = 0;
+MainWin *QtUi::_mainWin = 0;
 QList<AbstractNotificationBackend *> QtUi::_notificationBackends;
 QList<AbstractNotificationBackend::Notification> QtUi::_notifications;
 
@@ -67,12 +67,16 @@ QtUi::QtUi() : GraphicalUi() {
 QtUi::~QtUi() {
   unregisterAllNotificationBackends();
   delete _mainWin;
+  _mainWin = 0;
+  _instance = 0;
 }
 
 void QtUi::init() {
   _mainWin->init();
   QtUiSettings uiSettings;
   uiSettings.initAndNotify("UseSystemTrayIcon", this, SLOT(useSystemTrayChanged(QVariant)), true);
+
+  GraphicalUi::init(); // needs to be called after the mainWin is initialized
 }
 
 MessageModel *QtUi::createMessageModel(QObject *parent) {