From 29fdb6837af87416880851a52b80ca94756fdc2d Mon Sep 17 00:00:00 2001 From: nakeee Date: Thu, 2 Oct 2008 17:12:47 +0000 Subject: [PATCH] Making sure nothing broke on windows git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@745 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/VideoCommon/Src/Fifo.cpp | 6 +++++- Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Source/Core/VideoCommon/Src/Fifo.cpp b/Source/Core/VideoCommon/Src/Fifo.cpp index ae7efe3c26..2768bed065 100644 --- a/Source/Core/VideoCommon/Src/Fifo.cpp +++ b/Source/Core/VideoCommon/Src/Fifo.cpp @@ -168,8 +168,12 @@ void Fifo_EnterLoop(const SVideoInitialize &video_initialize) if (hEventOnIdle==NULL) PanicAlert("Fifo_EnterLoop() -> EventOnIdle NULL"); #endif +#ifdef _WIN32 // TODO(ector): Don't peek so often! - while (fifoStateRun || video_initialize.pPeekMessages()) + while (video_initialize.pPeekMessages()) +#else + while (fifoStateRun) +#endif { #if defined(THREAD_VIDEO_WAKEUP_ONIDLE) && defined(_WIN32) if (MsgWaitForMultipleObjects(1, &hEventOnIdle, FALSE, 1L, QS_ALLEVENTS) == WAIT_ABANDONED) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp index 3f61e2f04c..9c48b57d1f 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp @@ -94,7 +94,7 @@ BOOL Callback_PeekMessages() #else // GLX // This is called from Outside of our video thread, from EmuThread // The calls are NOT thread safe, so it breaks everything - return FALSE; + return FALSE; #endif }