[ros-diffs] [ekohl] 61687: [USETUP] Usetup does not properly return from quit+cancel. Patch by Ștefan Fulea. CORE-7783 #resolve #comment Thanks a lot!

Author: ekohl
Date: Sun Jan 19 09:47:27 2014
New Revision: 61687

URL: http://svn.reactos.org/svn/reactos?rev=61687&view=rev
Log:
[USETUP]
Usetup does not properly return from quit+cancel. Patch by Ștefan Fulea.
CORE-7783 #resolve #comment Thanks a lot!

Modified:
    trunk/reactos/base/setup/usetup/genlist.c
    trunk/reactos/base/setup/usetup/genlist.h
    trunk/reactos/base/setup/usetup/interface/usetup.c

Modified: trunk/reactos/base/setup/usetup/genlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/genlist.…
==============================================================================
--- trunk/reactos/base/setup/usetup/genlist.c	[iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/genlist.c	[iso-8859-1] Sun Jan 19 09:47:27 2014
@@ -483,6 +483,20 @@
 
 
 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)
 {
     if (Entry->List != List)

Modified: trunk/reactos/base/setup/usetup/genlist.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/genlist.…
==============================================================================
--- trunk/reactos/base/setup/usetup/genlist.h	[iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/genlist.h	[iso-8859-1] Sun Jan 19 09:47:27 2014
@@ -70,6 +70,9 @@
 ScrollToPositionGenericList (PGENERIC_LIST List, ULONG uIndex);
 
 VOID
+RedrawGenericList(PGENERIC_LIST List);
+
+VOID
 SetCurrentListEntry(PGENERIC_LIST List, PGENERIC_LIST_ENTRY Entry);
 
 PGENERIC_LIST_ENTRY

Modified: trunk/reactos/base/setup/usetup/interface/usetup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac…
==============================================================================
--- trunk/reactos/base/setup/usetup/interface/usetup.c	[iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/interface/usetup.c	[iso-8859-1] Sun Jan 19 09:47:27
2014
@@ -676,6 +676,8 @@
         {
             if (ConfirmQuit(Ir) == TRUE)
                 return QUIT_PAGE;
+            else
+                RedrawGenericList(LanguageList);
         }
         else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D)  /* ENTER */
         {
@@ -1354,7 +1356,7 @@
         }
     }
 
-    return DISPLAY_SETTINGS_PAGE;
+    return KEYBOARD_SETTINGS_PAGE;
 }
 
 
@@ -1420,7 +1422,7 @@
         }
     }
 
-    return DISPLAY_SETTINGS_PAGE;
+    return LAYOUT_SETTINGS_PAGE;
 }