Merge branch 'v0.15'

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.7)
 project(libdatachannel
-	VERSION 0.15.5
+	VERSION 0.15.6
 	LANGUAGES CXX)
 set(PROJECT_DESCRIPTION "C/C++ WebRTC network library featuring Data Channels, Media Transport, and WebSockets")
 

src/impl/websocket.cpp

@@ -28,8 +28,8 @@
 #include "verifiedtlstransport.hpp"
 #include "wstransport.hpp"
 
-#include <regex>
 #include <array>
+#include <regex>
 
 #ifdef _WIN32
 #include <winsock2.h>
@@ -118,7 +118,7 @@ void WebSocket::close() {
 }
 
 void WebSocket::remoteClose() {
-	if (state.load() != State::Closed) {
+	if (state != State::Closed) {
 		close();
 		closeTransports();
 	}
@@ -181,7 +181,7 @@ template <typename T>
 shared_ptr<T> emplaceTransport(WebSocket *ws, shared_ptr<T> *member, shared_ptr<T> transport) {
 	transport->start();
 	std::atomic_store(member, transport);
-	if (ws->state.load() == WebSocket::State::Closed) {
+	if (ws->state == WebSocket::State::Closed) {
 		std::atomic_store(member, decltype(transport)(nullptr));
 		transport->stop();
 		return nullptr;