projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed enabled inline assembler for backtrace on windows
[quassel.git]
/
src
/
common
/
signalproxy.cpp
diff --git
a/src/common/signalproxy.cpp
b/src/common/signalproxy.cpp
index
b3410e6
..
e7c641b
100644
(file)
--- a/
src/common/signalproxy.cpp
+++ b/
src/common/signalproxy.cpp
@@
-275,6
+275,7
@@
void SignalProxy::init() {
connect(&_heartBeatTimer, SIGNAL(timeout()), this, SLOT(sendHeartBeat()));
setHeartBeatInterval(30);
setMaxHeartBeatCount(2);
connect(&_heartBeatTimer, SIGNAL(timeout()), this, SLOT(sendHeartBeat()));
setHeartBeatInterval(30);
setMaxHeartBeatCount(2);
+ _heartBeatTimer.start();
_secure = false;
updateSecureState();
}
_secure = false;
updateSecureState();
}
@@
-333,13
+334,7
@@
void SignalProxy::setHeartBeatInterval(int secs) {
}
void SignalProxy::setMaxHeartBeatCount(int max) {
}
void SignalProxy::setMaxHeartBeatCount(int max) {
- if(max < 0)
- _heartBeatTimer.stop();
- else {
- _maxHeartBeatCount = max;
- if(!_heartBeatTimer.isActive())
- _heartBeatTimer.start();
- }
+ _maxHeartBeatCount = max;
}
bool SignalProxy::addPeer(SignalProxy* proxy) {
}
bool SignalProxy::addPeer(SignalProxy* proxy) {
@@
-960,7
+955,7
@@
void SignalProxy::sendHeartBeat() {
if(ioPeer->sentHeartBeats > 0) {
updateLag(ioPeer, ioPeer->sentHeartBeats * _heartBeatTimer.interval());
}
if(ioPeer->sentHeartBeats > 0) {
updateLag(ioPeer, ioPeer->sentHeartBeats * _heartBeatTimer.interval());
}
- if(ioPeer->sentHeartBeats >= maxHeartBeatCount())
+ if(
maxHeartBeatCount() >= 0 &&
ioPeer->sentHeartBeats >= maxHeartBeatCount())
toClose.append(ioPeer);
else
ioPeer->sentHeartBeats++;
toClose.append(ioPeer);
else
ioPeer->sentHeartBeats++;