[Scummvm-cvs-logs] SF.net SVN: scummvm:[48330] scummvm/branches/branch-1-1-0/backends/platform /ds/arm9/source/dsmain.cpp

[agent-q at users.sourceforge.net]

Revision: 48330
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48330&view=rev
Author:   agent-q
Date:     2010-03-20 17:19:23 +0000 (Sat, 20 Mar 2010)

Log Message:
-----------
DS: Slight fix to my previous timer fix for holding down the select button

Modified Paths:
--------------
    scummvm/branches/branch-1-1-0/backends/platform/ds/arm9/source/dsmain.cpp

Modified: scummvm/branches/branch-1-1-0/backends/platform/ds/arm9/source/dsmain.cpp
===================================================================
--- scummvm/branches/branch-1-1-0/backends/platform/ds/arm9/source/dsmain.cpp	2010-03-20 17:06:18 UTC (rev 48329)
+++ scummvm/branches/branch-1-1-0/backends/platform/ds/arm9/source/dsmain.cpp	2010-03-20 17:19:23 UTC (rev 48330)
@@ -1649,20 +1649,21 @@
 				selectTimeDown = getMillis();
 			}
 
-			if (getKeysHeld() & KEY_SELECT) {
-				if (getMillis() - selectTimeDown >= SELECT_HOLD_TIME) {
-					// Hold select down for one second - show GMM
-					g_engine->openMainMenuDialog();
+			if (selectTimeDown != -1) {
+				if (getKeysHeld() & KEY_SELECT) {
+					if (getMillis() - selectTimeDown >= SELECT_HOLD_TIME) {
+						// Hold select down for one second - show GMM
+						g_engine->openMainMenuDialog();
+					}
 				}
-			}
-
-			if (getKeysReleased() & KEY_SELECT) {
-				if (getMillis() - selectTimeDown < SELECT_HOLD_TIME) {
-					// Just pressed select - show DS options screen
-					showOptionsDialog();
+	
+				if (getKeysReleased() & KEY_SELECT) {
+					if (getMillis() - selectTimeDown < SELECT_HOLD_TIME) {
+						// Just pressed select - show DS options screen
+						showOptionsDialog();
+					}
 				}
 			}
-
 		}
 
 		if (!getIndyFightState() && !((getKeysHeld() & KEY_L) || (getKeysHeld() & KEY_R)) && (getKeysDown() & KEY_X)) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.