From 0ed4e21eede0a5ce03193aa1ec26864e30da09bd Mon Sep 17 00:00:00 2001 From: zeromus Date: Sun, 3 May 2009 20:55:35 +0000 Subject: [PATCH] integrate 2075 from rerecording branch. this touches a lot of file because merges for me always make null changes to a ton of files and i am hoping that by checking it in this once, the problem will go away --- desmume/src/NDSSystem.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/desmume/src/NDSSystem.cpp b/desmume/src/NDSSystem.cpp index f8a0001c1..69bc98496 100644 --- a/desmume/src/NDSSystem.cpp +++ b/desmume/src/NDSSystem.cpp @@ -882,6 +882,8 @@ void NDS_Reset(BOOL resetBySavestate) FILE* inf = 0; NDS_header * header = NDS_getROMHeader(); + FCEUI_StopMovie(); + if (!header) return ; if (MMU.bupmem.fp)