Changeset 719

Timestamp:

01/14/12 03:59:52 (4 months ago)

Author:

josh

Message:

-- RTMP: Make stream creation and teardown more resilient to weirdness.

File:

• trunk/sources/thelib/src/protocols/rtmp/basertmpprotocol.cpp (modified) (3 diffs)

trunk/sources/thelib/src/protocols/rtmp/basertmpprotocol.cpp

@@ -360 +360 @@
 
         if (_streams[streamId] == NULL) {
-                FATAL("Try to close a NULL stream");
-                return false;
+                WARN("Try to close a NULL stream");
+                return true;
         }
 
@@ -462 +462 @@
 
         if (_streams[streamId] == NULL) {
-                FATAL("Try to play a stream on a NULL placeholder");
-                return NULL;
-        }
+                WARN("Try to play a stream on a NULL placeholder");
+        } else {
 
         if (_streams[streamId]->GetType() != ST_NEUTRAL_RTMP) {
@@ -474 +473 @@
         delete _streams[streamId];
         _streams[streamId] = NULL;
+    }
 
         BaseOutNetRTMPStream *pBaseOutNetRTMPStream = BaseOutNetRTMPStream::GetInstance(