diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-02-18 09:15:56 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-02-18 09:15:56 +0000 |
| commit | bc54761a4332b875e1962a21f2858db598fa7c18 (patch) | |
| tree | a5232624703b4b22f3dd383e29aac050a1a5fd0c /gui | |
| parent | 34cfcc5169cafa8ae9e0d6469e20dc11c122c077 (diff) | |
| download | pcsxr-bc54761a4332b875e1962a21f2858db598fa7c18.tar.gz | |
-gui: allow using "pcsx -cdfile XXX.iso" without -nogui.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@63524 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/LnxMain.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gui/LnxMain.c b/gui/LnxMain.c index 77cdfa42..c04061c0 100644 --- a/gui/LnxMain.c +++ b/gui/LnxMain.c @@ -319,7 +319,6 @@ int main(int argc, char *argv[]) { SetIsoFile(isofilename); runcd = RUN_CD; - UseGui = FALSE; } else if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "-help") || @@ -333,7 +332,7 @@ int main(int argc, char *argv[]) { "\t-nogui\t\tDon't open the GTK GUI\n" "\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsx/pcsx.cfg)\n" "\t-psxout\t\tEnable PSX output\n" - "\t-slowboot\t\tEnable BIOS Logo\n" + "\t-slowboot\tEnable BIOS Logo\n" "\t-load STATENUM\tLoads savestate STATENUM (1-9)\n" "\t-h -help\tDisplay this message\n" "\tfile\t\tLoads file\n")); @@ -410,11 +409,11 @@ int main(int argc, char *argv[]) { chdir(plugin_default_dir); g_free(plugin_default_dir); - if (UseGui) SetIsoFile(NULL); + if (UseGui && runcd != RUN_CD) SetIsoFile(NULL); if (SysInit() == -1) return 1; - if (UseGui) { + if (UseGui && runcd != RUN_CD) { StartGui(); } else { // the following only occurs if the gui isn't started |