ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes the bug loading the wrong movie extras via Movie->Recent.

This commit is contained in:
aquanull 2018-04-04 18:33:42 +08:00
parent 9560521507
commit c161dd892b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/drivers/win/window.cpp
View File

@ -1689,9 +1689,12 @@ LRESULT FAR PASCAL AppWndProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
// A menu item for the recent movie files menu was clicked. // A menu item for the recent movie files menu was clicked.
if(wParam >= MOVIE_FIRST_RECENT_FILE && wParam < MOVIE_FIRST_RECENT_FILE + MAX_NUMBER_OF_MOVIE_RECENT_FILES) if(wParam >= MOVIE_FIRST_RECENT_FILE && wParam < MOVIE_FIRST_RECENT_FILE + MAX_NUMBER_OF_MOVIE_RECENT_FILES)
{ {
// aquanull: FCEUI_LoadMovie() calls AddRecentMovieFile(), which may change the orders of recent movies.
// For FCEUX_LoadMovieExtras() to receive the correct filename, fname has to be unaffected.
char*& fname = recent_movie[wParam - MOVIE_FIRST_RECENT_FILE]; char*& fname = recent_movie[wParam - MOVIE_FIRST_RECENT_FILE];
if(fname) if(fname)
{ {
string movie_fname = fname;
if (!FCEUI_LoadMovie(fname, 1, false)) if (!FCEUI_LoadMovie(fname, 1, false))
{ {
int result = MessageBox(hWnd,"Remove from list?", "Could Not Open Recent File", MB_YESNO); int result = MessageBox(hWnd,"Remove from list?", "Could Not Open Recent File", MB_YESNO);
@ -1701,7 +1704,7 @@ LRESULT FAR PASCAL AppWndProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
UpdateMovieRMenu(recentmoviemenu, recent_movie, MENU_MOVIE_RECENT, MOVIE_FIRST_RECENT_FILE); UpdateMovieRMenu(recentmoviemenu, recent_movie, MENU_MOVIE_RECENT, MOVIE_FIRST_RECENT_FILE);
} }
} else { } else {
FCEUX_LoadMovieExtras(fname); FCEUX_LoadMovieExtras(movie_fname.c_str());
} }
} }
} }