From a5a80cd033073d4e4b9e5b1e4fb61f6324fafcf2 Mon Sep 17 00:00:00 2001 From: David Ludwig Date: Sun, 15 Nov 2015 13:04:42 -0500 Subject: [PATCH] WinRT: fixed crash in SDL_CondWaitTimeout, when using Win10's MSVC runtime --- src/thread/stdcpp/SDL_syscond.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/thread/stdcpp/SDL_syscond.cpp b/src/thread/stdcpp/SDL_syscond.cpp index 51ec4dc7c..69e106859 100644 --- a/src/thread/stdcpp/SDL_syscond.cpp +++ b/src/thread/stdcpp/SDL_syscond.cpp @@ -128,7 +128,7 @@ SDL_CondWaitTimeout(SDL_cond * cond, SDL_mutex * mutex, Uint32 ms) } try { - std::unique_lock cpp_lock(mutex->cpp_mutex, std::defer_lock_t()); + std::unique_lock cpp_lock(mutex->cpp_mutex, std::adopt_lock_t()); if (ms == SDL_MUTEX_MAXWAIT) { cond->cpp_cond.wait( cpp_lock