WIN32: enable mouse cursor on GUI always. Also CDR plugin is not mandatory so no complaining about it.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@86240 e17a0e51-4ae3-4d35-97c3-1a29b211df97

2 files changed, 10 insertions, 8 deletions

diff --git a/win32/gui/WndMain.c b/win32/gui/WndMain.c
index 04bfbcd5..d10a82c0 100755
--- a/win32/gui/WndMain.c
+++ b/win32/gui/WndMain.c
@@ -645,6 +645,7 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) {
 					CdromId[0] = '\0';
 					CdromLabel[0] = '\0';
 					UpdateMenuItems();
+					ShowCursor(TRUE); // we want GUI to have cursor always
 					return TRUE;
 
 				case ID_EMULATOR_SWITCH_ISO:
@@ -1908,7 +1909,7 @@ void SysRunGui() {
 }
 
 void UpdateMenuItems() {
-	if (CdromId[0] != '\0') {
+	if (CdromId[0] != '\0') { // Emulating...
 		EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_NETPLAY, MF_BYCOMMAND | MF_GRAYED);
 		EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_LINKCABLE, MF_BYCOMMAND | MF_GRAYED);
 		EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_CONTROLLERS, MF_BYCOMMAND | MF_GRAYED);
@@ -1921,7 +1922,7 @@ void UpdateMenuItems() {
 		}
 
 		ResetMenuSlots();
-	} else {
+	} else { // GUI...
 		EnableMenuItem(gApp.hMenu, ID_EMULATOR_RESET, MF_BYCOMMAND | MF_GRAYED);
 		EnableMenuItem(gApp.hMenu, ID_EMULATOR_RUN, MF_BYCOMMAND | MF_GRAYED);
 		EnableMenuItem(gApp.hMenu, ID_EMULATOR_SHUTDOWN, MF_BYCOMMAND | MF_GRAYED);
@@ -1950,7 +1951,7 @@ void UpdateMenuItems() {
 		EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_NETPLAY, MF_BYCOMMAND | MF_ENABLED);
 		EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_LINKCABLE, MF_BYCOMMAND | MF_ENABLED);
 		EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_CONTROLLERS, MF_BYCOMMAND | MF_ENABLED);
-		EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_CDROM, MF_BYCOMMAND | MF_ENABLED);
+		EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_CDROM, MF_BYCOMMAND | ( Config.Cdr[0] != '\0' ? MF_ENABLED : MF_GRAYED ));
 		EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_SOUND, MF_BYCOMMAND | MF_ENABLED);
 		EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_GRAPHICS, MF_BYCOMMAND | MF_ENABLED);
 		EnableMenuItem(gApp.hMenu, ID_CONFIGURATION, MF_BYCOMMAND | MF_ENABLED);
diff --git a/win32/gui/plugin.c b/win32/gui/plugin.c
index 12cad204..fe610a82 100755
--- a/win32/gui/plugin.c
+++ b/win32/gui/plugin.c
@@ -163,6 +163,7 @@ void PADhandleKey(int key) {
 			break;
 
 		case VK_ESCAPE:
+			ShowCursor(TRUE); // we want GUI to have cursor always
 			Running = 0;
 			ClosePlugins();
 			SysRunGui();
@@ -215,7 +216,7 @@ int _OpenPlugins(HWND hWnd) {
 	GPU_clearDynarec(clearDynarec);
 
 	ret = CDR_open();
-	if (ret < 0) { SysMessage (_("Error Opening CDR Plugin")); return -1; }
+	//if (ret < 0) { SysMessage (_("Error Opening CDR Plugin")); return -1; }
 
 	SetCurrentDirectory(PcsxrDir);
 	if (Config.UseNet && !NetOpened) {
@@ -284,12 +285,12 @@ int _OpenPlugins(HWND hWnd) {
 	SPU_registerCallback(SPUirq);
 	ret = PAD1_open(hWnd);
 	if (ret < 0) { SysMessage (_("Error Opening PAD1 Plugin (%d)"), ret); return -1; }
-    PAD1_registerVibration(GPU_visualVibration);
-    PAD1_registerCursor(GPU_cursor);
+	PAD1_registerVibration(GPU_visualVibration);
+	PAD1_registerCursor(GPU_cursor);
 	ret = PAD2_open(hWnd);
 	if (ret < 0) { SysMessage (_("Error Opening PAD2 Plugin (%d)"), ret); return -1; }
-    PAD2_registerVibration(GPU_visualVibration);
-    PAD2_registerCursor(GPU_cursor);
+	PAD2_registerVibration(GPU_visualVibration);
+	PAD2_registerCursor(GPU_cursor);
 #ifdef ENABLE_SIO1API
 	ret = SIO1_open(hWnd);
 	if (ret < 0) { SysMessage (_("Error Opening SIO1 plugin (%d)"), ret); return -1; }