projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify and fix (re)connection logic
[quassel.git]
/
src
/
client
/
coreconnection.h
diff --git
a/src/client/coreconnection.h
b/src/client/coreconnection.h
index
9ba9d6a
..
0bf402e
100644
(file)
--- a/
src/client/coreconnection.h
+++ b/
src/client/coreconnection.h
@@
-182,6
+182,7
@@
private:
QTimer _reconnectTimer;
bool _wantReconnect;
QTimer _reconnectTimer;
bool _wantReconnect;
+ bool _wasReconnect;
QSet<QObject *> _netsToSync;
int _numNetsToSync;
QSet<QObject *> _netsToSync;
int _numNetsToSync;
@@
-189,8
+190,6
@@
private:
QString _progressText;
QString _coreInfoString(const QVariantMap &);
QString _progressText;
QString _coreInfoString(const QVariantMap &);
- bool _wasReconnect;
- bool _requestedDisconnect;
bool _resetting;
inline CoreAccountModel *accountModel() const;
bool _resetting;
inline CoreAccountModel *accountModel() const;