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

Issue 331 - let's also fix the "double initialization" issue when booting cdvd plugin from the commandline. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1724 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-09-01 10:00:57 +00:00
parent 4307e18e71
commit 646bf1bfac
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/Linux/LnxSysExec.cpp
View File

@ -249,7 +249,7 @@ void RunGui()
{ {
// Initially bypass GUI and start PCSX2 directly. // Initially bypass GUI and start PCSX2 directly.
CDVDsys_ChangeSource( g_Startup.CdvdSource ); CDVDsys_ChangeSource( g_Startup.CdvdSource );
DoCDVDopen( g_Startup.ImageName ); if( !OpenCDVD( g_Startup.ImageName ) ) return;
if (OpenPlugins() == -1) return; if (OpenPlugins() == -1) return;

6
pcsx2/windows/WinMain.cpp
View File

@ -379,10 +379,8 @@ void RunGui()
// Initially bypass GUI and start PCSX2 directly. // Initially bypass GUI and start PCSX2 directly.
CDVDsys_ChangeSource( g_Startup.CdvdSource ); CDVDsys_ChangeSource( g_Startup.CdvdSource );
DoCDVDopen( g_Startup.ImageName ); if( !OpenCDVD( g_Startup.ImageName ) ) return;
if( OpenPlugins() == -1 ) return;
if (OpenPlugins() == -1)
return;
SysPrepareExecution( (g_Startup.StartupMode == Startup_FromELF) ? g_Startup.ImageName : NULL, !g_Startup.SkipBios ); SysPrepareExecution( (g_Startup.StartupMode == Startup_FromELF) ? g_Startup.ImageName : NULL, !g_Startup.SkipBios );
} }