# HG changeset patch
# User Gloval
# Date 1370781451 -14400
# Node ID 746f7ef994cb4d492929eda884e784976b378bfe
# Parent  fd3bea473c0c129e327a3474324b961e2639fc8f# Parent  8ff88e39e09707970f52107c288ed3f9be96c594
Merge

diff -r fd3bea473c0c -r 746f7ef994cb GUIWindow.cpp
--- a/GUIWindow.cpp	Sun Jun 09 16:36:24 2013 +0400
+++ b/GUIWindow.cpp	Sun Jun 09 16:37:31 2013 +0400
@@ -159,34 +159,19 @@
   v1 = toupper(uHotkey);
   v2 = uNumVisibleWindows;
   v3 = v1;
-  if ( uNumVisibleWindows >= 0 )
+  for( v2 = uNumVisibleWindows; v2 >= 0 && pVisibleWindowsIdxs[v2] > 0; v2-- )
   {
-    while ( 2 )
-    {
-      v4 = &pWindowList[pVisibleWindowsIdxs[v2] - 1];
-      for ( result = v4->pControlsHead; result; result = result->pNext )
-      {
-        if ( result->uHotkey == v3 )
-        {
-          pMessageQueue_50CBD0->AddMessage(result->msg, result->msg_param, 0);
-          /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
-          {
-            pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)result->uControlID;
-            pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = v6;
-            *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0;
-            ++pMessageQueue_50CBD0->uNumMessages;
-          }*/
-          return result;
-        }
-      }
-      if ( v4->uFrameX || v4->uFrameY || !(v4->uFrameWidth == 640 && v4->uFrameHeight == 480) )
-      {
-        --v2;
-        if ( v2 >= 0 )
-          continue;
-      }
-      break;
-    }
+	v4 = &pWindowList[pVisibleWindowsIdxs[v2] - 1];
+	for ( result = v4->pControlsHead; result; result = result->pNext )
+	{
+	  if ( result->uHotkey == v3 )
+	  {
+		pMessageQueue_50CBD0->AddMessage(result->msg, result->msg_param, 0);
+		return result;
+	  }
+	}
+	if ( !v4->uFrameX && !v4->uFrameY && (v4->uFrameWidth == 640 && v4->uFrameHeight == 480) )
+	  break;
   }
   return 0;
 }