Author: ekohl Date: Thu May 12 16:18:32 2016 New Revision: 71321
URL: http://svn.reactos.org/svn/reactos?rev=71321&view=rev Log: [USETUP] Pressing F3-Enter during setup behaves wrong sometimes. Patch by Wim Hueskes. CORE-11231 #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] Thu May 12 16:18:32 2016 @@ -1978,6 +1978,8 @@ { if (ConfirmQuit(Ir) == TRUE) return QUIT_PAGE; + + break; } else if (Cancel == TRUE) { @@ -2133,6 +2135,8 @@ { if (ConfirmQuit(Ir) == TRUE) return QUIT_PAGE; + + break; } else if (Cancel == TRUE) { @@ -2287,6 +2291,8 @@ { if (ConfirmQuit(Ir) == TRUE) return QUIT_PAGE; + + break; } else if (Cancel == TRUE) { @@ -2375,7 +2381,7 @@ } }
- return SELECT_PARTITION_PAGE; + return CONFIRM_DELETE_SYSTEM_PARTITION_PAGE; }
@@ -3250,8 +3256,11 @@ ULONG Length;
/* We do not need the filsystem list any more */ - DestroyFileSystemList(FileSystemList); - FileSystemList = NULL; + if (FileSystemList != NULL) + { + DestroyFileSystemList(FileSystemList); + FileSystemList = NULL; + }
if (PartitionList == NULL || PartitionList->CurrentDisk == NULL ||