[hpoussin] 40687: WINLDR: Repair LiveCD boot

Author: hpoussin
Date: Sat Apr 25 01:48:20 2009
New Revision: 40687

URL: http://svn.reactos.org/svn/reactos?rev=40687&view=rev
Log:
WINLDR: Repair LiveCD boot

Modified:
    trunk/reactos/boot/freeldr/freeldr/windows/winldr.c

Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Sat Apr 25 01:48:20
2009
@@ -469,6 +469,14 @@
 		return;
 	}
 
+	/* Special case for LiveCD */
+	if (!_strnicmp(FullPath, "LiveCD", strlen("LiveCD")))
+	{
+		strcpy(BootPath, FullPath + strlen("LiveCD"));
+		MachDiskGetBootPath(FullPath, sizeof(FullPath));
+		strcat(FullPath, BootPath);
+	}
+
 	/* Convert FullPath to SystemRoot */
 	PathSeparator = strstr(FullPath, "\\");
 	strcpy(SystemRoot, PathSeparator);
@@ -479,14 +487,6 @@
 	{
 		/* Nothing read, make the string empty */
 		strcpy(BootOptions, "");
-	}
-
-	/* Special case for LiveCD */
-	if (!_strnicmp(SystemRoot, "LiveCD", strlen("LiveCD")))
-	{
-		strcpy(BootPath, SystemRoot + strlen("LiveCD"));
-		MachDiskGetBootPath(SystemRoot, sizeof(SystemRoot));
-		strcat(SystemRoot, BootPath);
 	}
 
 	/* Let user know we started loading */