fix: 修复模拟独占全屏错误

Blinue · Jun 5, 2024 · 5f8d04b · 5f8d04b
1 parent 238f66e
commit 5f8d04b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/Magpie.Core/ExclModeHelper.cpp b/src/Magpie.Core/ExclModeHelper.cpp
@@ -30,7 +30,7 @@ wil::unique_mutex_nothrow ExclModeHelper::EnterExclMode() noexcept {
 		return exclModeMutex;
 	}
 
-	if (!wil::event_is_signaled(exclModeMutex.get())) {
+	if (!wil::handle_wait(exclModeMutex.get(), 0)) {
 		Logger::Get().Error("获取 __DDrawExclMode__ 失败");
 		exclModeMutex.reset();
 		return exclModeMutex;

diff --git a/src/Magpie.Core/ScalingWindow.cpp b/src/Magpie.Core/ScalingWindow.cpp
@@ -412,8 +412,10 @@ LRESULT ScalingWindow::_MessageHandler(UINT msg, WPARAM wParam, LPARAM lParam) n
 	}
 	case WM_DESTROY:
 	{
-		_exclModeMutex.ReleaseMutex();
-		_exclModeMutex.reset();
+		if (_exclModeMutex) {
+			_exclModeMutex.ReleaseMutex();
+			_exclModeMutex.reset();
+		}
 
 		_hwndDDF.reset();
 		_isDDFWindowShown = false;