From 42ef1d09a72f38ccc2a7a99246be7a385bdfb068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Sun, 1 Feb 2015 15:22:31 +0000
Subject: [PATCH] [FREELDR]: Pseudo-fix my previous commit. But anyway, the
 "usebiossettings" case looks strange... (I mean, this precise line:
 LoaderRedirectionInformation.PortAddress = (PUCHAR)strtoul(Settings, 0, 16);
 ).

svn path=/trunk/; revision=66142
---
 reactos/boot/freeldr/freeldr/windows/headless.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/reactos/boot/freeldr/freeldr/windows/headless.c b/reactos/boot/freeldr/freeldr/windows/headless.c
index 76feab00f91..f77cc6424b0 100644
--- a/reactos/boot/freeldr/freeldr/windows/headless.c
+++ b/reactos/boot/freeldr/freeldr/windows/headless.c
@@ -242,7 +242,7 @@ WinLdrInitializeHeadlessPort(VOID)
 VOID
 WinLdrSetupEms(IN PCHAR BootOptions)
 {
-    PCHAR Settings;
+    PCHAR Settings, RedirectPort;
 
     /* Start fresh */
     RtlZeroMemory(&LoaderRedirectionInformation, sizeof(HEADLESS_LOADER_BLOCK));
@@ -252,7 +252,7 @@ WinLdrSetupEms(IN PCHAR BootOptions)
     Settings = strstr(BootOptions, "/redirect=");
     if (Settings)
     {
-        PCHAR RedirectPort = strstr(Settings, "com");
+        RedirectPort = strstr(Settings, "com");
         if (RedirectPort)
         {
             RedirectPort += sizeof("com") - 1;
@@ -261,10 +261,11 @@ WinLdrSetupEms(IN PCHAR BootOptions)
         }
         else
         {
-            Settings = strstr(Settings, "usebiossettings");
-            if (Settings)
+            RedirectPort = strstr(Settings, "usebiossettings");
+            if (RedirectPort)
             {
                 UiDrawStatusText("ACPI SRT Table Not Supported...");
+                return;
             }
             else
             {