Win32: CDR plugin is not mandatory to have since there is build-in ISO support.

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

2 files changed, 6 insertions, 3 deletions

diff --git a/libpcsxcore/plugins.c b/libpcsxcore/plugins.c
index 30b62b0d..5d7c5220 100755
--- a/libpcsxcore/plugins.c
+++ b/libpcsxcore/plugins.c
@@ -838,7 +838,7 @@ const char *GetIsoFile(void) {
 }
 
 boolean UsingIso(void) {
-	return (IsoFile[0] != '\0');
+	return (IsoFile[0] != '\0' || Config.Cdr[0] == '\0');
 }
 
 void SetCdOpenCaseTime(s64 time) {
diff --git a/win32/gui/ConfigurePlugins.c b/win32/gui/ConfigurePlugins.c
index 7c740e25..6686c9a9 100755
--- a/win32/gui/ConfigurePlugins.c
+++ b/win32/gui/ConfigurePlugins.c
@@ -321,7 +321,7 @@ void OnOK(HWND hW) {
 #endif
 	char *biosFILE=GetSelDLL(hW,IDC_LISTBIOS);
 
-    if (gpuDLL == NULL || spuDLL == NULL || cdrDLL == NULL || pad1DLL == NULL ||
+    if (gpuDLL == NULL || spuDLL == NULL || /*cdrDLL == NULL ||*/ pad1DLL == NULL ||
 		pad2DLL == NULL || biosFILE == NULL
 #ifdef ENABLE_SIO1API
 		|| sio1DLL == NULL
@@ -334,7 +334,10 @@ void OnOK(HWND hW) {
 	strcpy(Config.Bios, biosFILE);
 	strcpy(Config.Gpu,  gpuDLL);
 	strcpy(Config.Spu,  spuDLL);
-	strcpy(Config.Cdr,  cdrDLL);
+	if (cdrDLL != NULL)

+		strcpy(Config.Cdr,  cdrDLL);

+	else

+		Config.Cdr[0] = '\0';
 	strcpy(Config.Pad1, pad1DLL);
 	strcpy(Config.Pad2, pad2DLL);
 #ifdef ENABLE_SIO1API