X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmain_mono.cpp;h=84e6fae86880e63a1082ed94c6abb4b301ac1a07;hp=f0bafd9e58a3650e720c545436bc197052d24fb6;hb=ec07b6300b6b3b125127ad2d7cd42fabeb020b1b;hpb=15ee1478137bc748e27b0b06537973d8df04b9d7

diff --git a/src/common/main_mono.cpp b/src/common/main_mono.cpp
index f0bafd9e..84e6fae8 100644
--- a/src/common/main_mono.cpp
+++ b/src/common/main_mono.cpp
@@ -30,6 +30,7 @@
 #include "coreproxy.h"
 #include "settings.h"
 #include "chatwidget.h"
+#include "mainwin.h"
 
 int main(int argc, char **argv) {
   QApplication app(argc, argv);
@@ -50,12 +51,17 @@ int main(int argc, char **argv) {
   Settings::init();
   Style::init();
 
-  //MainWin *mainWin = new MainWin();
+  MainWin *mainWin = new MainWin();
   //mainWin->show();
-  //mainWin->init();
-  Client::instance();
+  Client::init(mainWin);
+  mainWin->init();
   int exitCode = app.exec();
   //delete core;
+  
+  // the mainWin has to be deleted before the Core
+  // if not Quassel will crash on exit under certain conditions since the gui
+  // still wants to access clientdata
+  delete mainWin;
   Client::destroy();
   Core::destroy();
   //delete guiProxy;