[Scummvm-cvs-logs] SF.net SVN: scummvm:[33845] scummvm/branches/branch-0-12-0/backends/ platform/wince

knakos at users.sourceforge.net knakos at users.sourceforge.net
Wed Aug 13 21:34:05 CEST 2008


Revision: 33845
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33845&view=rev
Author:   knakos
Date:     2008-08-13 19:34:02 +0000 (Wed, 13 Aug 2008)

Log Message:
-----------
fix a small bug in the quit dialog (sync)

Modified Paths:
--------------
    scummvm/branches/branch-0-12-0/backends/platform/wince/CEActionsPocket.cpp
    scummvm/branches/branch-0-12-0/backends/platform/wince/CEActionsSmartphone.cpp

Modified: scummvm/branches/branch-0-12-0/backends/platform/wince/CEActionsPocket.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/backends/platform/wince/CEActionsPocket.cpp	2008-08-13 19:32:25 UTC (rev 33844)
+++ scummvm/branches/branch-0-12-0/backends/platform/wince/CEActionsPocket.cpp	2008-08-13 19:34:02 UTC (rev 33845)
@@ -215,7 +215,7 @@
 }
 
 bool CEActionsPocket::perform(GUI::ActionType action, bool pushed) {
-	static bool keydialogrunning = false;
+	static bool keydialogrunning = false, quitdialog = false;
 
 	if (!pushed) {
 		switch(action) {
@@ -292,12 +292,14 @@
 			_CESystem->move_cursor_right();
 			return true;
 		case POCKET_ACTION_QUIT:
-			{
+			if (!quitdialog) {
+				quitdialog = true;
 				GUI::MessageDialog alert("   Are you sure you want to quit ?   ", "Yes", "No");
 				if (alert.runModal() == GUI::kMessageOK)
 					_mainSystem->quit();
-				return true;
+				quitdialog = false;
 			}
+			return true;
 		case POCKET_ACTION_BINDKEYS:
 			if (!keydialogrunning) {
 				keydialogrunning = true;

Modified: scummvm/branches/branch-0-12-0/backends/platform/wince/CEActionsSmartphone.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/backends/platform/wince/CEActionsSmartphone.cpp	2008-08-13 19:32:25 UTC (rev 33844)
+++ scummvm/branches/branch-0-12-0/backends/platform/wince/CEActionsSmartphone.cpp	2008-08-13 19:34:02 UTC (rev 33845)
@@ -179,7 +179,7 @@
 }
 
 bool CEActionsSmartphone::perform(GUI::ActionType action, bool pushed) {
-	static bool keydialogrunning = false;
+	static bool keydialogrunning = false, quitdialog = false;
 
 	if (!pushed) {
 		switch (action) {
@@ -250,12 +250,14 @@
 			_CESystem->smartphone_rotate_display();
 			return true;
 		case SMARTPHONE_ACTION_QUIT:
-			{
+			if (!quitdialog) {
+				quitdialog = true;
 				GUI::MessageDialog alert("   Are you sure you want to quit ?   ", "Yes", "No");
 				if (alert.runModal() == GUI::kMessageOK)
 					_mainSystem->quit();
-				return true;
+				quitdialog = false;
 			}
+			return true;
 	}
 
 	return false;


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




More information about the Scummvm-git-logs mailing list