X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=9611f71b28fede4fa986d37c752db9bd378cdb76;hp=a53d07d7b5d267ebfa214f221d0c1d2c290a3dab;hb=5c6804f291a63f978e328aeddcc8448e3443b45e;hpb=85b55cf023c96f4dbd61ec415a15214f99e281b3

diff --git a/src/client/client.cpp b/src/client/client.cpp
index a53d07d7..9611f71b 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -28,7 +28,6 @@
 #include "bufferviewmanager.h"
 #include "clientbacklogmanager.h"
 #include "clientirclisthelper.h"
-#include "global.h"
 #include "identity.h"
 #include "ircchannel.h"
 #include "ircuser.h"
@@ -52,8 +51,11 @@ Client *Client::instance() {
 }
 
 void Client::destroy() {
-  //delete instanceptr;
-  instanceptr->deleteLater();
+  if(instanceptr) {
+    delete instanceptr->mainUi;
+    instanceptr->deleteLater();
+    instanceptr = 0;
+  }
 }
 
 void Client::init(AbstractUi *ui) {