nel/src/gui/widget_manager.cpp

@@ -2304,16 +2304,16 @@ namespace NLGUI
 				SModalWndInfo mwi = getModal();
 				if (mwi.ModalExitKeyPushed)
 					disableModalWindow();
-
-				handled= true;
+			}
 		}
 
-			CInterfaceGroup	*win= getLastEscapableTopWindow();
-			if ( win )
-			{
 		// Manage "quit window" If the Key is ESCAPE, no captureKeyboard
+		if( eventDesc.getKeyEventType() == CEventDescriptorKey::keydown && eventDesc.getKey() == NLMISC::KeyESCAPE )
+		{
 			// Get the last escapable active top window. NB: this is ergonomically better.
-
+			CInterfaceGroup	*win= getLastEscapableTopWindow();
+			if( win )
+			{
 				// If the window is a modal, must pop it.
 				if( dynamic_cast<CGroupModal*>(win) )
 				{
@@ -2399,12 +2399,6 @@ namespace NLGUI
 			}
 		}
 
-	    if (eventDesc.getKeyEventType() == CEventDescriptorKey::keydown && eventDesc.getKey() == NLMISC::KeyESCAPE && !handled && !isKeyboardCaptured())
-	    {
-		    CAHManager::getInstance()->runActionHandler("enter_modal", NULL, "group=ui:interface:quit_dialog");
-		    handled = true;
-	    }
-
 		// General case: handle it in the Captured keyboard
 		if ( getCaptureKeyboard() != NULL && !handled)
 		{