[openMSX-commits] SF.net SVN: openmsx:[11857] openmsx/trunk/src/input/Keyboard.cc

[<aw...@us...>]

Revision: 11857
          http://openmsx.svn.sourceforge.net/openmsx/?rev=11857&view=rev
Author:   awulms
Date:     2010-12-29 19:31:56 +0000 (Wed, 29 Dec 2010)

Log Message:
-----------
Fix asserts in capslockaligner:executeuntil

Modified Paths:
--------------
    openmsx/trunk/src/input/Keyboard.cc

Modified: openmsx/trunk/src/input/Keyboard.cc
===================================================================
--- openmsx/trunk/src/input/Keyboard.cc	2010-12-29 19:25:45 UTC (rev 11856)
+++ openmsx/trunk/src/input/Keyboard.cc	2010-12-29 19:31:56 UTC (rev 11857)
@@ -1220,13 +1220,18 @@
 			alignCapsLock(time);
 			break;
 		case MUST_DISTRIBUTE_KEY_RELEASE: {
-			shared_ptr<const Event> event(new KeyUpEvent(Keys::K_CAPSLOCK));
-			msxEventDistributor.distributeEvent(event, time);
-			state = IDLE;
+			if (keyboard.sdlReleasesCapslock) {
+				shared_ptr<const Event> event(new KeyUpEvent(Keys::K_CAPSLOCK));
+				msxEventDistributor.distributeEvent(event, time);
+				state = IDLE;
+			}
+			else {
+				assert(false && "Unexpected state MUST_DISTRIBUTE_KEY_RELEASE in CapsLockAligner::executeUntil");
+			}
 		}
 			break;
 		default:
-			assert("Unexpected state in CapsLockAligner::executeUntil");
+			assert(false && "Unexpected state in CapsLockAligner::executeUntil");
 			break;
 	}
 }


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