-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

10 files changed, 32 insertions, 32 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
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 858341e2..0d3947e7 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pcsxr 1.0\n"
 "Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
-"POT-Creation-Date: 2011-02-18 16:56+0800\n"
+"POT-Creation-Date: 2011-02-18 17:11+0800\n"
 "PO-Revision-Date: 2010-12-30 12:51+0100\n"
 "Last-Translator: Jean-André Santoni <jean.andre.santoni@gmail.com>\n"
 "Language-Team: French <jean.andre.santoni@gmail.com>\n"
@@ -804,7 +804,7 @@ msgid ""
 "\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"
@@ -2831,7 +2831,7 @@ msgid ""
 "\toptions:\n"
 "\t-nogui\t\tDon't open the GUI\n"
 "\t-psxout\t\tEnable PSX output\n"
-"\t-slowboot\t\tEnable BIOS logo\n"
+"\t-slowboot\tEnable BIOS logo\n"
 "\t-runcd\t\tRuns CD-ROM (requires -nogui)\n"
 "\t-cdfile FILE\tRuns a CD image file (requires -nogui)\n"
 "\t-help\t\tDisplay this message"
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 2e921dea..5fc995cd 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pcsxr 1.0\n"
 "Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
-"POT-Creation-Date: 2011-02-18 16:56+0800\n"
+"POT-Creation-Date: 2011-02-18 17:11+0800\n"
 "PO-Revision-Date: 2011-02-08 15:14+0100\n"
 "Last-Translator: Delirious <delirious@freemail.hu>\n"
 "Language-Team: Delirious <delirious@freemail.hu>\n"
@@ -819,7 +819,7 @@ msgid ""
 "\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"
@@ -2825,7 +2825,7 @@ msgid ""
 "\toptions:\n"
 "\t-nogui\t\tDon't open the GUI\n"
 "\t-psxout\t\tEnable PSX output\n"
-"\t-slowboot\t\tEnable BIOS logo\n"
+"\t-slowboot\tEnable BIOS logo\n"
 "\t-runcd\t\tRuns CD-ROM (requires -nogui)\n"
 "\t-cdfile FILE\tRuns a CD image file (requires -nogui)\n"
 "\t-help\t\tDisplay this message"
diff --git a/po/it.po b/po/it.po
index dc0a8c57..e24e8f53 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pcsxr 1.0\n"
 "Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
-"POT-Creation-Date: 2011-02-18 16:56+0800\n"
+"POT-Creation-Date: 2011-02-18 17:11+0800\n"
 "PO-Revision-Date: 2010-03-15 16:00+0200\n"
 "Last-Translator: Giovanni Scafora <giovanni@archlinux.org>\n"
 "Language-Team: Arch Linux Italian Team <giovanni@archlinux.org>\n"
@@ -829,7 +829,7 @@ msgid ""
 "\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"
@@ -2917,7 +2917,7 @@ msgid ""
 "\toptions:\n"
 "\t-nogui\t\tDon't open the GUI\n"
 "\t-psxout\t\tEnable PSX output\n"
-"\t-slowboot\t\tEnable BIOS logo\n"
+"\t-slowboot\tEnable BIOS logo\n"
 "\t-runcd\t\tRuns CD-ROM (requires -nogui)\n"
 "\t-cdfile FILE\tRuns a CD image file (requires -nogui)\n"
 "\t-help\t\tDisplay this message"
diff --git a/po/pcsx.pot b/po/pcsx.pot
index 8cfa6619..0b70ab5f 100644
--- a/po/pcsx.pot
+++ b/po/pcsx.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
-"POT-Creation-Date: 2011-02-18 16:56+0800\n"
+"POT-Creation-Date: 2011-02-18 17:11+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -785,7 +785,7 @@ msgid ""
 "\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"
@@ -2688,7 +2688,7 @@ msgid ""
 "\toptions:\n"
 "\t-nogui\t\tDon't open the GUI\n"
 "\t-psxout\t\tEnable PSX output\n"
-"\t-slowboot\t\tEnable BIOS logo\n"
+"\t-slowboot\tEnable BIOS logo\n"
 "\t-runcd\t\tRuns CD-ROM (requires -nogui)\n"
 "\t-cdfile FILE\tRuns a CD image file (requires -nogui)\n"
 "\t-help\t\tDisplay this message"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a44be401..74c05adb 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pcsx-df\n"
 "Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
-"POT-Creation-Date: 2011-02-18 16:56+0800\n"
+"POT-Creation-Date: 2011-02-18 17:11+0800\n"
 "PO-Revision-Date: 2009-11-28 23:57+0700\n"
 "Last-Translator: Wei Mingzhi <whistler@openoffice.org>\n"
 "Language-Team: PoBRE <romhackers@gmail.com>\n"
@@ -828,7 +828,7 @@ msgid ""
 "\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"
@@ -2866,7 +2866,7 @@ msgid ""
 "\toptions:\n"
 "\t-nogui\t\tDon't open the GUI\n"
 "\t-psxout\t\tEnable PSX output\n"
-"\t-slowboot\t\tEnable BIOS logo\n"
+"\t-slowboot\tEnable BIOS logo\n"
 "\t-runcd\t\tRuns CD-ROM (requires -nogui)\n"
 "\t-cdfile FILE\tRuns a CD image file (requires -nogui)\n"
 "\t-help\t\tDisplay this message"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index e45c43b9..d45a2ae0 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pcsxr 1.0\n"
 "Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
-"POT-Creation-Date: 2011-02-18 16:56+0800\n"
+"POT-Creation-Date: 2011-02-18 17:11+0800\n"
 "PO-Revision-Date: 2011-02-12 23:46+0300\n"
 "Last-Translator: Blade_Arma <edgbla@yandex.ru>\n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
@@ -794,6 +794,7 @@ msgid "Creating memory card: %s\n"
 msgstr "Создание карты памяти: %s\n"
 
 #: ../gui/LnxMain.c:329
+#, fuzzy
 msgid ""
 " pcsx [options] [file]\n"
 "\toptions:\n"
@@ -802,7 +803,7 @@ msgid ""
 "\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"
@@ -2776,7 +2777,7 @@ msgid ""
 "\toptions:\n"
 "\t-nogui\t\tDon't open the GUI\n"
 "\t-psxout\t\tEnable PSX output\n"
-"\t-slowboot\t\tEnable BIOS logo\n"
+"\t-slowboot\tEnable BIOS logo\n"
 "\t-runcd\t\tRuns CD-ROM (requires -nogui)\n"
 "\t-cdfile FILE\tRuns a CD image file (requires -nogui)\n"
 "\t-help\t\tDisplay this message"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1bd7fb3f..20650816 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pcsxr 1.0\n"
 "Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
-"POT-Creation-Date: 2011-02-18 16:56+0800\n"
-"PO-Revision-Date: 2011-02-18 16:56+0800\n"
+"POT-Creation-Date: 2011-02-18 17:11+0800\n"
+"PO-Revision-Date: 2011-02-18 17:11+0800\n"
 "Last-Translator: Wei Mingzhi <whistler_wmz@users.sf.net>\n"
 "Language-Team: Simplified Chinese <whistler@openoffice.org>\n"
 "Language: \n"
@@ -864,7 +864,7 @@ msgid ""
 "\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"
@@ -876,7 +876,7 @@ msgstr ""
 "\t-nogui\t\t不使用 GTK 图形界面\n"
 "\t-cfg 文件\t加载一个特定的配置文件 (默认为: ~/.pcsx/pcsx.cfg)\n"
 "\t-psxout\t\t启用 PSX 输出\n"
-"\t-slowboot\t\t显示 BIOS 启动画面\n"
+"\t-slowboot\t显示 BIOS 启动画面\n"
 "\t-load 编号\t加载指定编号的存档 (1-5)\n"
 "\t-h -help\t显示此信息\n"
 "\t文件\t\t加载文件\n"
@@ -2900,7 +2900,7 @@ msgid ""
 "\toptions:\n"
 "\t-nogui\t\tDon't open the GUI\n"
 "\t-psxout\t\tEnable PSX output\n"
-"\t-slowboot\t\tEnable BIOS logo\n"
+"\t-slowboot\tEnable BIOS logo\n"
 "\t-runcd\t\tRuns CD-ROM (requires -nogui)\n"
 "\t-cdfile FILE\tRuns a CD image file (requires -nogui)\n"
 "\t-help\t\tDisplay this message"
@@ -2909,7 +2909,7 @@ msgstr ""
 "\t选项:\n"
 "\t-nogui\t\t不打开 GUI\n"
 "\t-psxout\t\t启用 PSX 控制台输出\n"
-"\t-slowboot\t\t启用 BIOS 启动画面\n"
+"\t-slowboot\t启用 BIOS 启动画面\n"
 "\t-runcd\t\t运行 CD-ROM (需要 -nogui)\n"
 "\t-cdfile FILE\t运行 CD 镜像文件 (需要 -nogui)\n"
 "\t-help\t\t显示此信息"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2cfed643..89e502f7 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pcsxr 1.0\n"
 "Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
-"POT-Creation-Date: 2011-02-18 16:56+0800\n"
+"POT-Creation-Date: 2011-02-18 17:11+0800\n"
 "PO-Revision-Date: 2011-01-10 11:13+0800\n"
 "Last-Translator: Wei Mingzhi <whistler_wmz@users.sf.net>\n"
 "Language-Team: Traditional Chinese <whistler@openoffice.org>\n"
@@ -816,7 +816,7 @@ msgid ""
 "\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"
@@ -2795,7 +2795,7 @@ msgid ""
 "\toptions:\n"
 "\t-nogui\t\tDon't open the GUI\n"
 "\t-psxout\t\tEnable PSX output\n"
-"\t-slowboot\t\tEnable BIOS logo\n"
+"\t-slowboot\tEnable BIOS logo\n"
 "\t-runcd\t\tRuns CD-ROM (requires -nogui)\n"
 "\t-cdfile FILE\tRuns a CD image file (requires -nogui)\n"
 "\t-help\t\tDisplay this message"
diff --git a/win32/gui/WndMain.c b/win32/gui/WndMain.c
index 5a5f734d..309ffecf 100644
--- a/win32/gui/WndMain.c
+++ b/win32/gui/WndMain.c
@@ -216,7 +216,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 				"\toptions:\n"

 				"\t-nogui\t\tDon't open the GUI\n"

 				"\t-psxout\t\tEnable PSX output\n"

-				"\t-slowboot\t\tEnable BIOS logo\n"

+				"\t-slowboot\tEnable BIOS logo\n"

 				"\t-runcd\t\tRuns CD-ROM (requires -nogui)\n"

 				"\t-cdfile FILE\tRuns a CD image file (requires -nogui)\n"

 				"\t-help\t\tDisplay this message"),