Merge branch 'FocusLostESCSaveConfirmationDialog' into 'master'

Fixes bug #4650: Focus is lost after pressing ESC in confirmation dialog inside savegame dialog

See merge request OpenMW/openmw!145

AUTHORS.md

@@ -86,6 +86,7 @@ Programmers
     Jacob Essex (Yacoby)
     Jake Westrip (16bitint)
     James Carty (MrTopCat)
+    James Stephens (james-h-stephens)
     Jan-Peter Nilsson (peppe)
     Jan Borsodi (am0s)
     Jason Hooks (jhooks)

CHANGELOG.md

@@ -27,6 +27,7 @@
     Bug #4540: Rain delay when exiting water
     Bug #4600: Crash when no sound output is available or --no-sound is used.
     Bug #4639: Black screen after completing first mages guild mission + training
+    Bug #4650: Focus is lost after pressing ESC in confirmation dialog inside savegame dialog
     Bug #4701: PrisonMarker record is not hardcoded like other markers
     Bug #4703: Editor: it's possible to preview levelled list records
     Bug #4705: Editor: unable to open exterior cell views from Instances table

apps/openmw/mwgui/confirmationdialog.cpp

@@ -40,14 +40,13 @@ namespace MWGui
 
     bool ConfirmationDialog::exit()
     {
+        setVisible(false);
         eventCancelClicked();
         return true;
     }
 
     void ConfirmationDialog::onCancelButtonClicked(MyGUI::Widget* _sender)
     {
-        setVisible(false);
-
         exit();
     }