Fix reconnect and send timeout

elnormous · Nov 30, 2016 · 432fe91 · 432fe91
1 parent eac91ca
commit 432fe91
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Push.cpp b/src/Push.cpp
@@ -86,6 +86,8 @@ namespace relay
         connected = false;
         streamName.clear();
         streaming = false;
+        timeSinceConnect = 0.0f;
+        timeSinceHandshake = 0.0f;
         invokeId = 0;
         invokes.clear();
 
@@ -103,8 +105,6 @@ namespace relay
         reset();
         active = true;
 
-        timeSinceConnect = 0.0f;
-
         if (addresses.empty())
         {
             Log(Log::Level::ERR) << "[" << name << "] " << "No addresses to connect to";
@@ -145,12 +145,12 @@ namespace relay
 
     void Push::update(float delta)
     {
-        if (active && !socket.isReady())
+        if (active)
         {
             timeSinceConnect += delta;
             timeSinceHandshake += delta;
 
-            if (timeSinceConnect >= reconnectInterval ||
+            if ((!socket.isReady() && timeSinceConnect >= reconnectInterval) ||
                 (state != rtmp::State::HANDSHAKE_DONE && timeSinceHandshake >= reconnectInterval))
             {
                 connect();