--- a/XWorkstation.st	Wed Jul 28 10:47:40 2010 +0200
+++ b/XWorkstation.st	Tue Aug 03 11:20:05 2010 +0200
@@ -8692,8 +8692,8 @@
     |modifierKeyMap maxKeyPerMod ret nextKey|
 
     modifierKeyMap := self rawModifierMapping.
+    modifierKeyMap isEmptyOrNil ifTrue:[^ nil].
     maxKeyPerMod := modifierKeyMap size // 8.
-    modifierKeyMap isNil ifTrue:[^ nil].
 
     ret := Array new:8.
     nextKey := 1.
@@ -8747,7 +8747,7 @@
 rawModifierMapping
     "Get the raw Modifier Mapping."
 
-    |modifierKeyMap maxKeyPerMod |
+    |modifierKeyMap|
 
 %{
     XModifierKeymap *modmap;
@@ -8756,7 +8756,6 @@
         Display *dpy = myDpy;
 
         if ((modmap = XGetModifierMapping(dpy)) != 0) {
-           maxKeyPerMod = __MKSMALLINT(modmap->max_keypermod);
            modifierKeyMap = __BYTEARRAY_UNINITIALIZED_NEW_INT(modmap->max_keypermod * 8);
            if (modifierKeyMap != nil) {
                 memcpy((char *)__ByteArrayInstPtr(modifierKeyMap)->ba_element,
@@ -12027,11 +12026,11 @@
 !XWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.514 2010-07-05 19:08:51 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.515 2010-08-03 09:20:05 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.514 2010-07-05 19:08:51 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.515 2010-08-03 09:20:05 stefan Exp $'
 ! !
 
 XWorkstation initialize!