From: Shamus Hammons <jlhamm@acm.org>
Date: Tue, 5 Jul 2011 23:39:50 +0000 (+0000)
Subject: Merging qt-experimental into trunk.
X-Git-Tag: 2.0.0~34
X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5da604521611a960140b58a2fb0f236c65610b70;hp=6bbf8a69b977644a55a4abdea71dfa9e3bb6c087;p=virtualjaguar

Merging qt-experimental into trunk.
---

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index 88e55f8..c73d670 100644
--- a/src/gui/mainwin.cpp
+++ b/src/gui/mainwin.cpp
@@ -9,6 +9,7 @@
 // ---  ----------  -------------------------------------------------------------
 // JLH  12/23/2009  Created this file
 // JLH  12/20/2010  Added settings, menus & toolbars
+// JLH  07/05/2011  Added CD BIOS functionality to GUI
 //
 
 // FIXED:
@@ -489,6 +490,11 @@ void MainWin::TogglePowerState(void)
 		}
 		else
 		{
+// Should check for cartridgeLoaded here as well...!
+// We can clear it when toggling CDActive on, so that when we power cycle it does the
+// expected thing. Otherwise, if we use the file picker to insert a cart, we expect
+// to run the cart! Maybe have a RemoveCart function that only works if the CD unit
+// is active?
 			showUntunedTankCircuit = false;
 			pauseAct->setChecked(false);
 			pauseAct->setDisabled(false);