From ae37e1259edcc17eae317e03f8f67faa93c9d789 Mon Sep 17 00:00:00 2001 From: zeromus Date: Wed, 28 Dec 2016 17:25:12 -0600 Subject: [PATCH] winport: fix crash with HD prescale and --num-cores 1. OSD is messed up in this case. Not going to fix that now since --num-cores 1 is a very old quirks hack anyway. Fixes #20 --- desmume/src/frontend/windows/main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/desmume/src/frontend/windows/main.cpp b/desmume/src/frontend/windows/main.cpp index 833866b3f..f9f90e32c 100644 --- a/desmume/src/frontend/windows/main.cpp +++ b/desmume/src/frontend/windows/main.cpp @@ -2059,7 +2059,7 @@ void Display() if(CommonSettings.single_core()) { - video.srcBuffer = (u8*)dispInfo.masterNativeBuffer; + video.srcBuffer = (u8*)dispInfo.masterCustomBuffer; video.srcBufferSize = dispInfo.customWidth*dispInfo.customHeight*2*2; DoDisplay(true); } @@ -2209,7 +2209,7 @@ static void StepRunLoop_Paused() // periodically update single-core OSD when paused and in the foreground if(CommonSettings.single_core() && GetActiveWindow() == mainLoopData.hwnd) { - video.srcBuffer = (u8*)GPU->GetDisplayInfo().masterNativeBuffer; + video.srcBuffer = (u8*)GPU->GetDisplayInfo().masterCustomBuffer; DoDisplay(true); } @@ -5025,7 +5025,7 @@ DOKEYDOWN: if(CommonSettings.single_core()) { const NDSDisplayInfo &dispInfo = GPU->GetDisplayInfo(); - video.srcBuffer = (u8*)dispInfo.masterNativeBuffer; + video.srcBuffer = (u8*)dispInfo.masterCustomBuffer; DoDisplay(true); } }