Fixed 24BPP mode (used R twice instead of B), fixed problem with Object

[virtualjaguar] / src / gui / mainwin.cpp

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index c73d6708a6cbffb87b90685325223847f1e80391..75b4bc385ae734ca09a6e89ce7a5c849ddfbceaa 100644 (file)
--- a/src/gui/mainwin.cpp
+++ b/src/gui/mainwin.cpp
@@ -14,6 +14,7 @@
 
 // FIXED:
 //
+// - Add dbl click/enter to select in cart list, ESC to dimiss [DONE]
 //
 // STILL TO BE DONE:
 //
@@ -21,7 +22,6 @@
 // - Controller configuration
 // - Remove SDL dependencies (sound, mainly) from Jaguar core lib
 // - Add 1 key jumping in cartridge list (press 'R', jumps to carts starting with 'R', etc)
-// - Add dbl click/enter to select in cart list, ESC to dimiss
 //
 
 /*
@@ -165,7 +165,7 @@ MainWin::MainWin(): running(false), powerButtonOn(false), showUntunedTankCircuit
        configAct->setShortcut(QKeySequence(tr("Ctrl+c")));
        connect(configAct, SIGNAL(triggered()), this, SLOT(Configure()));
 
-       useCDAct = new QAction(QIcon(":/res/generic.png"), tr("&Use CD Unit"), this);
+       useCDAct = new QAction(QIcon(":/res/compact-disc.png"), tr("&Use CD Unit"), this);
        useCDAct->setStatusTip(tr("Use Jaguar Virtual CD unit"));
 //     useCDAct->setShortcut(QKeySequence(tr("Ctrl+c")));
        useCDAct->setCheckable(true);
@@ -479,6 +479,8 @@ void MainWin::TogglePowerState(void)
                pauseAct->setDisabled(true);
                showUntunedTankCircuit = true;
                running = true;
+               // This is just in case the ROM we were playing was in a narrow or wide field mode
+               TOMReset();
        }
        else
        {