Merge pull request #27 from meganz/hotfix/v0.9.9

Avoid heartbeats during termination
meganz · Aug 1, 2017 · 2ff213b · 2ff213b
2 parents 35ff258 + 3eaeba7
commit 2ff213b
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/src/chatClient.cpp b/src/chatClient.cpp
@@ -196,7 +196,10 @@ void Client::heartbeat()
 Client::~Client()
 {
  if (mHeartbeatTimer)
+ {
  karere::cancelInterval(mHeartbeatTimer);
+ mHeartbeatTimer = 0;
+ }
  //when the strophe::Connection is destroyed, its handlers are automatically destroyed
 }
 
@@ -724,8 +727,19 @@ promise::Promise<void> Client::doConnect(Presence pres)
  setConnState(kDisconnected);
  });
  assert(!mHeartbeatTimer);
- mHeartbeatTimer = karere::setInterval([this]()
+ auto wptr = weakHandle();
+ mHeartbeatTimer = karere::setInterval([this, wptr]()
  {
+ if (wptr.deleted())
+ {
+ return;
+ }
+
+ if (!mHeartbeatTimer)
+ {
+ return;
+ }
+
  heartbeat();
  }, 10000);
  return pms;