projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hiding daychange messages at the top of the buffer
[quassel.git]
/
src
/
core
/
sessionthread.cpp
diff --git
a/src/core/sessionthread.cpp
b/src/core/sessionthread.cpp
index
d507095
..
d178c2b
100644
(file)
--- a/
src/core/sessionthread.cpp
+++ b/
src/core/sessionthread.cpp
@@
-24,18
+24,18
@@
#include "coresession.h"
#include "coresession.h"
-SessionThread::SessionThread(UserId uid, QObject *parent) : QThread(parent) {
+SessionThread::SessionThread(UserId uid,
bool restoreState,
QObject *parent) : QThread(parent) {
_user = uid;
_session = 0;
_sessionInitialized = false;
_user = uid;
_session = 0;
_sessionInitialized = false;
+ _restoreState = restoreState,
connect(this, SIGNAL(initialized()), this, SLOT(setSessionInitialized()));
}
SessionThread::~SessionThread() {
connect(this, SIGNAL(initialized()), this, SLOT(setSessionInitialized()));
}
SessionThread::~SessionThread() {
- //
FIXME
+ //
shut down thread gracefully
quit();
wait();
quit();
wait();
- if(session()) _session->deleteLater();
}
CoreSession *SessionThread::session() {
}
CoreSession *SessionThread::session() {
@@
-76,8
+76,9
@@
void SessionThread::addClientToSession(QIODevice *socket) {
}
void SessionThread::run() {
}
void SessionThread::run() {
- _session = new CoreSession(user());
+ _session = new CoreSession(user()
, _restoreState
);
emit initialized();
exec();
emit initialized();
exec();
+ delete _session;
}
}