X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.cpp;h=8943f75408f36dd8be6409bca0527f33eafa960c;hb=f9a73e3ad8142212028a39b26ced62456e575b7a;hp=ac39e3640b6a22117bb24e1bd24585536a232e48;hpb=0d35728dcfe4190f2580931e806372ca800ee5bf;p=quassel.git

diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index ac39e364..8943f754 100644
--- a/src/common/signalproxy.cpp
+++ b/src/common/signalproxy.cpp
@@ -209,9 +209,7 @@ void SignalProxy::SignalProxyPeer::dispatchSignal(const RequestType &requestType
 //  SignalProxy
 // ==================================================
 SignalProxy::SignalProxy(QObject* parent)
-  : QObject(parent),
-  _heartBeatInterval(30),
-  _maxHeartBeatCount(2)
+  : QObject(parent)
 {
   setProxyMode(Client);
   init();
@@ -273,6 +271,8 @@ void SignalProxy::setProxyMode(ProxyMode mode) {
 }
 
 void SignalProxy::init() {
+  _heartBeatInterval = 0;
+  _maxHeartBeatCount = 0;
   _signalRelay = new SignalRelay(this);
   connect(&_heartBeatTimer, SIGNAL(timeout()), this, SLOT(sendHeartBeat()));
   setHeartBeatInterval(30);
@@ -995,7 +995,7 @@ void SignalProxy::receiveHeartBeatReply(AbstractPeer *peer, const QVariantList &
 }
 
 void SignalProxy::customEvent(QEvent *event) {
-  switch(event->type()) {
+  switch(+event->type()) {
   case PeerSignal:
     {
       PeerSignalEvent *e = static_cast<PeerSignalEvent *>(event);