From 04487e7a9013e936ca68758d91d5c2c1aaeeed07 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Sun, 19 Jan 2014 09:47:27 +0000
Subject: [PATCH] =?utf8?q?[USETUP]=20Usetup=20does=20not=20properly=20retu?=
 =?utf8?q?rn=20from=20quit+cancel.=20Patch=20by=20=C8=98tefan=20Fulea.=20C?=
 =?utf8?q?ORE-7783=20#resolve=20#comment=20Thanks=20a=20lot!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

svn path=/trunk/; revision=61687
---
 reactos/base/setup/usetup/genlist.c          | 14 ++++++++++++++
 reactos/base/setup/usetup/genlist.h          |  3 +++
 reactos/base/setup/usetup/interface/usetup.c |  6 ++++--
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/reactos/base/setup/usetup/genlist.c b/reactos/base/setup/usetup/genlist.c
index a1f0f4dce0d..9073ca3880c 100644
--- a/reactos/base/setup/usetup/genlist.c
+++ b/reactos/base/setup/usetup/genlist.c
@@ -482,6 +482,20 @@ ScrollUpGenericList (PGENERIC_LIST List)
 }
 
 
+VOID
+RedrawGenericList(PGENERIC_LIST List)
+{
+    if (List->CurrentEntry == NULL)
+        return;
+
+    if (List->Redraw)
+    {
+        DrawListEntries(List);
+        DrawScrollBarGenericList(List);
+    }
+}
+
+
 VOID
 SetCurrentListEntry(PGENERIC_LIST List, PGENERIC_LIST_ENTRY Entry)
 {
diff --git a/reactos/base/setup/usetup/genlist.h b/reactos/base/setup/usetup/genlist.h
index 2d4cc74fbe2..8b09a5eaf58 100644
--- a/reactos/base/setup/usetup/genlist.h
+++ b/reactos/base/setup/usetup/genlist.h
@@ -69,6 +69,9 @@ ScrollPageUpGenericList(PGENERIC_LIST List);
 VOID
 ScrollToPositionGenericList (PGENERIC_LIST List, ULONG uIndex);
 
+VOID
+RedrawGenericList(PGENERIC_LIST List);
+
 VOID
 SetCurrentListEntry(PGENERIC_LIST List, PGENERIC_LIST_ENTRY Entry);
 
diff --git a/reactos/base/setup/usetup/interface/usetup.c b/reactos/base/setup/usetup/interface/usetup.c
index 260005348bd..74bf8e64e0a 100644
--- a/reactos/base/setup/usetup/interface/usetup.c
+++ b/reactos/base/setup/usetup/interface/usetup.c
@@ -676,6 +676,8 @@ LanguagePage(PINPUT_RECORD Ir)
         {
             if (ConfirmQuit(Ir) == TRUE)
                 return QUIT_PAGE;
+            else
+                RedrawGenericList(LanguageList);
         }
         else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D)  /* ENTER */
         {
@@ -1354,7 +1356,7 @@ KeyboardSettingsPage(PINPUT_RECORD Ir)
         }
     }
 
-    return DISPLAY_SETTINGS_PAGE;
+    return KEYBOARD_SETTINGS_PAGE;
 }
 
 
@@ -1420,7 +1422,7 @@ LayoutSettingsPage(PINPUT_RECORD Ir)
         }
     }
 
-    return DISPLAY_SETTINGS_PAGE;
+    return LAYOUT_SETTINGS_PAGE;
 }
 
 
-- 
2.17.1