2
0
Эх сурвалжийг харах

Merge pull request #1384 from murat-dogan/master

call resetcallbacks only after triggerClosed
Paul-Louis Ageneau 3 сар өмнө
parent
commit
0e40aeb058

+ 2 - 3
src/impl/datachannel.cpp

@@ -108,9 +108,8 @@ void DataChannel::close() {
 			transport->closeStream(mStream.value());
 
 		triggerClosed();
-	}
-
-	resetCallbacks();
+		resetCallbacks();
+	}	
 }
 
 void DataChannel::remoteClose() { close(); }

+ 4 - 3
src/impl/track.cpp

@@ -69,10 +69,11 @@ void Track::close() {
 	PLOG_VERBOSE << "Closing Track";
 
 	if (!mIsClosed.exchange(true))
+	{
 		triggerClosed();
-
-	setMediaHandler(nullptr);
-	resetCallbacks();
+		setMediaHandler(nullptr);
+		resetCallbacks();
+	}		
 }
 
 message_variant Track::trackMessageToVariant(message_ptr message) {