diff options
| author | SND\shalma_cp <SND\shalma_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-12-11 17:54:31 +0000 |
|---|---|---|
| committer | SND\shalma_cp <SND\shalma_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-12-11 17:54:31 +0000 |
| commit | d58b2a17cdc6e3f6ad3691bb59bd999a0b449f15 (patch) | |
| tree | e6bb9ec1dcb05672095c7745292f8b7f79491083 /win32 | |
| parent | 2975b7e2847b0197f164a3d05233546ae15c8785 (diff) | |
| download | pcsxr-d58b2a17cdc6e3f6ad3691bb59bd999a0b449f15.tar.gz | |
wndmain.c, lnxmain.c, gtk2gui.c, emuthread.m
- Patch 7713
- (dario86) Detect PAL demos (SCED)
- (dario86) Fix PAL auto-detection with root counter init
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@61080 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/gui/WndMain.c | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/win32/gui/WndMain.c b/win32/gui/WndMain.c index ac2e25f5..90f7fcb4 100644 --- a/win32/gui/WndMain.c +++ b/win32/gui/WndMain.c @@ -455,13 +455,16 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { RestoreWindow();
return TRUE;
}
- SysReset();
if (CheckCdrom() == -1) {
ClosePlugins();
RestoreWindow();
SysMessage(_("The CD does not appear to be a valid Playstation CD"));
return TRUE;
}
+
+ // Auto-detect: region first, then rcnt reset
+ SysReset();
+
if (LoadCdrom() == -1) {
ClosePlugins();
RestoreWindow();
@@ -504,13 +507,16 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { RestoreWindow();
return TRUE;
}
- SysReset();
if (CheckCdrom() == -1) {
ClosePlugins();
RestoreWindow();
SysMessage(_("The CD does not appear to be a valid Playstation CD"));
return TRUE;
}
+
+ // Auto-detect: region first, then rcnt reset
+ SysReset();
+
if (LoadCdrom() == -1) {
ClosePlugins();
RestoreWindow();
@@ -532,8 +538,11 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { RestoreWindow();
return TRUE;
}
- SysReset();
CheckCdrom();
+
+ // Auto-detect: region first, then rcnt reset
+ SysReset();
+
Load(File);
Running = 1;
psxCpu->Execute();
@@ -569,13 +578,16 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { RestoreWindow();
return TRUE;
}
- SysReset();
if (CheckCdrom() == -1) {
fprintf(stderr, _("The CD does not appear to be a valid Playstation CD"));
ClosePlugins();
RestoreWindow();
return TRUE;
}
+
+ // Auto-detect: region first, then rcnt reset
+ SysReset();
+
if (LoadCdrom() == -1) {
fprintf(stderr, _("Could not load CD-ROM!"));
ClosePlugins();
@@ -599,8 +611,11 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { case ID_EMULATOR_RESET:
SetMenu(hWnd, NULL);
OpenPlugins(hWnd);
- SysReset();
CheckCdrom();
+
+ // Auto-detect: region first, then rcnt reset
+ SysReset();
+
LoadCdrom();
ShowCursor(FALSE);
Running = 1;
|