From 8a0d40791b63681ae500f6497a06fdd3f6b085ba Mon Sep 17 00:00:00 2001
From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Tue, 16 Feb 2010 02:26:04 +0100
Subject: [PATCH] Don't crash on windows

---
 src/qtui/qtui.cpp             | 2 ++
 src/uisupport/graphicalui.cpp | 6 +++++-
 src/uisupport/graphicalui.h   | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/qtui/qtui.cpp b/src/qtui/qtui.cpp
index 2a088360..9dbc60af 100644
--- a/src/qtui/qtui.cpp
+++ b/src/qtui/qtui.cpp
@@ -73,6 +73,8 @@ 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) {
diff --git a/src/uisupport/graphicalui.cpp b/src/uisupport/graphicalui.cpp
index 5d9a4198..f9a35741 100644
--- a/src/uisupport/graphicalui.cpp
+++ b/src/uisupport/graphicalui.cpp
@@ -48,9 +48,13 @@ GraphicalUi::GraphicalUi(QObject *parent) : AbstractUi(parent) {
 
 #ifdef Q_WS_WIN
   _dwTickCount = 0;
-  mainWidget()->installEventFilter(this);
 #endif
+}
 
+void GraphicalUi::init() {
+#ifdef Q_WS_WIN
+  mainWidget()->installEventFilter(this);
+#endif
 }
 
 GraphicalUi::~GraphicalUi() {
diff --git a/src/uisupport/graphicalui.h b/src/uisupport/graphicalui.h
index 1ed55b60..140c07fa 100644
--- a/src/uisupport/graphicalui.h
+++ b/src/uisupport/graphicalui.h
@@ -38,6 +38,7 @@ class GraphicalUi : public AbstractUi {
 public:
   GraphicalUi(QObject *parent = 0);
   virtual ~GraphicalUi();
+  virtual void init();
 
   //! Access global ActionCollections.
   /** These ActionCollections are associated with the main window, i.e. they contain global
-- 
2.20.1