projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Wupps. Make compile without D-Bus again.
[quassel.git]
/
src
/
client
/
client.cpp
diff --git
a/src/client/client.cpp
b/src/client/client.cpp
index
ce734cc
..
9611f71
100644
(file)
--- a/
src/client/client.cpp
+++ b/
src/client/client.cpp
@@
-28,7
+28,6
@@
#include "bufferviewmanager.h"
#include "clientbacklogmanager.h"
#include "clientirclisthelper.h"
#include "bufferviewmanager.h"
#include "clientbacklogmanager.h"
#include "clientirclisthelper.h"
-#include "global.h"
#include "identity.h"
#include "ircchannel.h"
#include "ircuser.h"
#include "identity.h"
#include "ircchannel.h"
#include "ircuser.h"
@@
-52,8
+51,11
@@
Client *Client::instance() {
}
void Client::destroy() {
}
void Client::destroy() {
- //delete instanceptr;
- instanceptr->deleteLater();
+ if(instanceptr) {
+ delete instanceptr->mainUi;
+ instanceptr->deleteLater();
+ instanceptr = 0;
+ }
}
void Client::init(AbstractUi *ui) {
}
void Client::init(AbstractUi *ui) {
@@
-294,6
+296,7
@@
void Client::disconnectFromCore() {
emit disconnected();
emit coreConnectionStateChanged(false);
emit disconnected();
emit coreConnectionStateChanged(false);
+ backlogManager()->reset();
messageProcessor()->reset();
// Clear internal data. Hopefully nothing relies on it at this point.
messageProcessor()->reset();
// Clear internal data. Hopefully nothing relies on it at this point.