[ros-diffs] [ekohl] 71797: [USETUP] Fix crash during installation. Patch by Wim Hueskens. CORE-11409 #resolve #comment Thanks a lot!

Author: ekohl
Date: Sun Jul  3 14:57:21 2016
New Revision: 71797

URL: http://svn.reactos.org/svn/reactos?rev=71797&view=rev
Log:
[USETUP]
Fix crash during installation.
Patch by Wim Hueskens.
CORE-11409 #resolve #comment Thanks a lot!

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

Modified: trunk/reactos/base/setup/usetup/interface/usetup.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interface...
==============================================================================
--- trunk/reactos/base/setup/usetup/interface/usetup.c	[iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/interface/usetup.c	[iso-8859-1] Sun Jul  3 14:57:21 2016
@@ -2558,6 +2558,7 @@
     PCHAR DiskUnit;
     PCHAR PartUnit;
     CHAR PartTypeString[32];
+    FORMATMACHINESTATE PreviousFormatState;

DPRINT("SelectFileSystemPage()\n");

@@ -2592,6 +2593,7 @@
         return QUIT_PAGE;
     }

+    PreviousFormatState = PartitionList->FormatState;
     switch (PartitionList->FormatState)
     {
         case Start:
@@ -2827,6 +2829,7 @@
         else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
                  (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE))  /* ESC */
         {
+            PartitionList->FormatState = Start;
             return SELECT_PARTITION_PAGE;
         }
         else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
@@ -2852,6 +2855,8 @@
             }
         }
     }
+
+    PartitionList->FormatState = PreviousFormatState;

return SELECT_FILE_SYSTEM_PAGE;
 }