X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fmainwin.cpp;h=83d0a53855adcd33c3a1812f226be80d39e3c2e3;hb=62b541c6c09933ea0daf800ecd86467f6f15b584;hp=3cebc8ac1541904a707e847f91a01e71fe6cb934;hpb=0c9f3744f0129a95e60bb886073b65144ba31a22;p=virtualjaguar

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index 3cebc8a..83d0a53 100644
--- a/src/gui/mainwin.cpp
+++ b/src/gui/mainwin.cpp
@@ -166,7 +166,7 @@ MainWin::MainWin(): running(false), powerButtonOn(false), showUntunedTankCircuit
 	filePickAct->setShortcut(QKeySequence(tr("Ctrl+i")));
 	connect(filePickAct, SIGNAL(triggered()), this, SLOT(InsertCart()));
 
-	configAct = new QAction(QIcon(":/res/generic.png"), tr("&Configure"), this);
+	configAct = new QAction(QIcon(":/res/wrench.png"), tr("&Configure"), this);
 	configAct->setStatusTip(tr("Configure options for Virtual Jaguar"));
 	configAct->setShortcut(QKeySequence(tr("Ctrl+c")));
 	connect(configAct, SIGNAL(triggered()), this, SLOT(Configure()));
@@ -183,11 +183,11 @@ MainWin::MainWin(): running(false), powerButtonOn(false), showUntunedTankCircuit
 
 	// Create menus & toolbars
 
-	fileMenu = menuBar()->addMenu(tr("&File"));
-	fileMenu->addAction(filePickAct);
-	fileMenu->addAction(useCDAct);
+	fileMenu = menuBar()->addMenu(tr("&Jaguar"));
 	fileMenu->addAction(powerAct);
 	fileMenu->addAction(pauseAct);
+	fileMenu->addAction(filePickAct);
+	fileMenu->addAction(useCDAct);
 	fileMenu->addAction(configAct);
 	fileMenu->addAction(quitAppAct);
 
@@ -536,6 +536,8 @@ void MainWin::ShowAboutWin(void)
 
 void MainWin::InsertCart(void)
 {
+	// If the emulator is running, we pause it here and unpause it later
+	// if we dismiss the file selector without choosing anything
 	if (running)
 	{
 		ToggleRunState();
@@ -560,7 +562,7 @@ void MainWin::LoadSoftware(QString file)
 	running = false;							// Prevent bad things(TM) from happening...
 	pauseForFileSelector = false;				// Reset the file selector pause flag
 	SET32(jaguarMainRAM, 0, 0x00200000);		// Set top of stack...
-	cartridgeLoaded = (JaguarLoadFile(file.toAscii().data()) ? true : false);
+	cartridgeLoaded = JaguarLoadFile(file.toAscii().data());
 
 	char * biosPointer = jaguarBootROM;