From 181d7467e1bb4669a266f0a07a5c0d660321cddd Mon Sep 17 00:00:00 2001 From: adelikat Date: Thu, 12 Mar 2009 03:09:55 +0000 Subject: [PATCH] Win32 - Fix small bug where Close ROM was not gray when no ROM loaded --- src/drivers/win/window.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/drivers/win/window.cpp b/src/drivers/win/window.cpp index 5e7b9bf8..eb8c77d0 100644 --- a/src/drivers/win/window.cpp +++ b/src/drivers/win/window.cpp @@ -306,11 +306,14 @@ void updateGameDependentMenus(unsigned int enable) for (unsigned int i = 0; i < sizeof(menu_ids) / sizeof(*menu_ids); i++) { +/* +adelikat: basicbot is gone #ifndef _USE_SHARED_MEMORY_ if(simpled[x] == MENU_BASIC_BOT) EnableMenuItem(fceumenu,menu_ids[i],MF_BYCOMMAND| MF_GRAYED); else #endif +*/ EnableMenuItem(fceumenu, menu_ids[i], MF_BYCOMMAND | (enable ? MF_ENABLED : MF_GRAYED)); } } @@ -1636,7 +1639,7 @@ LRESULT FAR PASCAL AppWndProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam) EnableMenuItem(fceumenu,MENU_RESET,MF_BYCOMMAND | (FCEU_IsValidUI(FCEUI_RESET)?MF_ENABLED:MF_GRAYED)); EnableMenuItem(fceumenu,MENU_POWER,MF_BYCOMMAND | (FCEU_IsValidUI(FCEUI_POWER)?MF_ENABLED:MF_GRAYED)); EnableMenuItem(fceumenu,MENU_TASEDIT,MF_BYCOMMAND | (FCEU_IsValidUI(FCEUI_TASEDIT)?MF_ENABLED:MF_GRAYED)); - EnableMenuItem(fceumenu,MENU_CLOSE_FILE,MF_BYCOMMAND | (FCEU_IsValidUI(FCEUI_CLOSEGAME)?MF_ENABLED:MF_GRAYED)); + EnableMenuItem(fceumenu,MENU_CLOSE_FILE,MF_BYCOMMAND | (FCEU_IsValidUI(FCEUI_CLOSEGAME) && GameInfo ?MF_ENABLED:MF_GRAYED)); EnableMenuItem(fceumenu,MENU_RECENT_FILES,MF_BYCOMMAND | ((FCEU_IsValidUI(FCEUI_OPENGAME) && recent_files[0]) ?MF_ENABLED:MF_GRAYED)); //adelikat - added && recent_files, otherwise this line prevents recent from ever being gray when tasedit is not engaged EnableMenuItem(fceumenu,MENU_OPEN_FILE,MF_BYCOMMAND | (FCEU_IsValidUI(FCEUI_OPENGAME)?MF_ENABLED:MF_GRAYED)); EnableMenuItem(fceumenu,MENU_RECORD_MOVIE,MF_BYCOMMAND | (FCEU_IsValidUI(FCEUI_RECORDMOVIE)?MF_ENABLED:MF_GRAYED));