summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2018-09-13 16:33:06 +0200
committerGitHub <noreply@github.com>2018-09-13 16:33:06 +0200
commit4d228e66b45a6a3859decde6b2452c78728f8958 (patch)
tree9ca9e38fa99746af273479a6abd9e48d76fdb914 /platform
parent68f224a50483c39c6d13141c0ceb26549ad2579f (diff)
parent01c3c1a07bfbaf6df8b1154e5ef31ecc890b03a3 (diff)
Merge pull request #22030 from Faless/sockets_fixes
Properly initialize Winsock on startup
Diffstat (limited to 'platform')
-rw-r--r--platform/uwp/os_uwp.cpp2
-rw-r--r--platform/windows/os_windows.cpp1
2 files changed, 3 insertions, 0 deletions
diff --git a/platform/uwp/os_uwp.cpp b/platform/uwp/os_uwp.cpp
index 5b5f30244e..f489c0894f 100644
--- a/platform/uwp/os_uwp.cpp
+++ b/platform/uwp/os_uwp.cpp
@@ -406,6 +406,8 @@ void OSUWP::finalize() {
}
void OSUWP::finalize_core() {
+
+ NetSocketPosix::cleanup();
}
void OSUWP::alert(const String &p_alert, const String &p_title) {
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index 6723210432..67fc1c7496 100644
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@@ -1512,6 +1512,7 @@ void OS_Windows::finalize_core() {
timeEndPeriod(1);
memdelete(process_map);
+ NetSocketPosix::cleanup();
}
void OS_Windows::alert(const String &p_alert, const String &p_title) {