Ticket #8595: popup.patch

gui/PopUpWidget.cpp

@@ -193 +193 @@
         if (item >= 0 && _popUpBoss->_entries[item].name.size() == 0)
                 item = -1;
 
-        if (item == -1 && !isMouseDown())
+        if (item == -1 && !isMouseDown()) {
+                setSelection(_popUpBoss->_selectedItem);
                 return;
+        }
 
         // ...and update the selection accordingly
         setSelection(item);
@@ -202 +204 @@
 
 void PopUpDialog::handleKeyDown(uint16 ascii, int keycode, int modifiers) {
         if (keycode == 27) {    // escape
+                // Don't change the previous selection
+                setResult(-1);
                 close();
                 return;
         }