From 522bbb7cec7dc1cf19d348475443d1473fe86abe Mon Sep 17 00:00:00 2001 From: zeromus Date: Fri, 23 Jul 2010 20:54:48 +0000 Subject: [PATCH] win32: dont resume emulation if resetting while paused. possibly annoying, but without it theres no way to pause on the very first frames. todo: consider philosophy of this --- desmume/src/windows/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp index d87b32098..73b163a3c 100644 --- a/desmume/src/windows/main.cpp +++ b/desmume/src/windows/main.cpp @@ -6062,7 +6062,7 @@ void ResetGame() if(movieMode != MOVIEMODE_PLAY) { NDS_Reset(); - if(movieMode == MOVIEMODE_INACTIVE) + if(movieMode == MOVIEMODE_INACTIVE && !emu_paused) Unpause(); } }