1 files changed, 4 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c
index 74781f638..c93842305 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c
@@ -2222,8 +2222,6 @@ FIXME: Don't enqueue the KeyRelease event if the key was
 
 int nxagentHandleKeyPress(XEvent *X, enum HandleEventResult *result)
 {
-  xEvent x;
-
   if (nxagentXkbState.Initialized == 0)
   {
     if (X -> xkey.keycode == nxagentCapsLockKeycode)
@@ -2255,15 +2253,15 @@ int nxagentHandleKeyPress(XEvent *X, enum HandleEventResult *result)
     nxagentXkbState.Num = (~nxagentXkbState.Num & 1);
   }
 
+  nxagentLastServerTime = X -> xkey.time;
+
   nxagentLastEventTime = nxagentLastKeyPressTime = GetTimeInMillis();
-  
-  memset(&x, 0, sizeof(xEvent));
+
+  xEvent x = {0};
   x.u.u.type = KeyPress;
   x.u.u.detail = nxagentConvertKeycode(X -> xkey.keycode);
   x.u.keyButtonPointer.time = nxagentLastKeyPressTime;
 
-  nxagentLastServerTime = X -> xkey.time;
-
   mieqEnqueue(&x);
 
   CriticalOutputPending = 1;