[SETUPLIB][USETUP] Remove the deprecated GenericListHasSingleEntry() function and...

[reactos.git] / base / setup / usetup / genlist.c

diff --git a/base/setup/usetup/genlist.c b/base/setup/usetup/genlist.c
index 8e8baff..c43f89c 100644 (file)
--- a/base/setup/usetup/genlist.c
+++ b/base/setup/usetup/genlist.c
@@ -356,17 +356,20 @@ DrawGenericListCurrentItem(
     IN SHORT Left,
     IN SHORT Top)
 {
     IN SHORT Left,
     IN SHORT Top)
 {

-    //
-    // FIXME: That stuff crashes when the list is empty!!
-    //

     CHAR CurrentItemText[256];
     CHAR CurrentItemText[256];

-    if (GetEntryDescriptionProc)
+
+    if (GetEntryDescriptionProc &&
+        GetNumberOfListEntries(List) > 0)

     {
         GetEntryDescriptionProc(GetCurrentListEntry(List),
                                 CurrentItemText,
                                 ARRAYSIZE(CurrentItemText));
         CONSOLE_SetTextXY(Left, Top, CurrentItemText);
     }
     {
         GetEntryDescriptionProc(GetCurrentListEntry(List),
                                 CurrentItemText,
                                 ARRAYSIZE(CurrentItemText));
         CONSOLE_SetTextXY(Left, Top, CurrentItemText);
     }

+    else
+    {
+        CONSOLE_SetTextXY(Left, Top, "");
+    }

 }
 
 VOID
 }
 
 VOID