[NTOSKRNL]

- Don't enable the kernel debugger if the DEBUG option was not set
- Fixes displaying the BSOD when not booting in debug mode (broken in r41534)

svn path=/trunk/; revision=47110

diff --git a/reactos/ntoskrnl/kd/kdinit.c b/reactos/ntoskrnl/kd/kdinit.c
index aae380e..6c5f240 100644 (file)
--- a/reactos/ntoskrnl/kd/kdinit.c
+++ b/reactos/ntoskrnl/kd/kdinit.c
@@ -171,15 +171,14 @@ KdInitSystem(ULONG BootPhase,
         {
             /* Enable on the serial port */
             KdDebuggerEnabled = TRUE;
         {
             /* Enable on the serial port */
             KdDebuggerEnabled = TRUE;

+            KdDebuggerNotPresent = FALSE;

             KdpDebugMode.Serial = TRUE;
             KdpDebugMode.Serial = TRUE;

-        }

 
 #ifdef KDBG
 
 #ifdef KDBG

-        /* Get the KDBG Settings and enable it */
-        KdDebuggerEnabled = TRUE;
-        KdDebuggerNotPresent = FALSE;
-        KdbpGetCommandLineSettings(LoaderBlock->LoadOptions);
+            /* Get the KDBG Settings */
+            KdbpGetCommandLineSettings(LoaderBlock->LoadOptions);

 #endif
 #endif

+        }

 
         /* Get the port and baud rate */
         Port = strstr(CommandLine, "DEBUGPORT");
 
         /* Get the port and baud rate */
         Port = strstr(CommandLine, "DEBUGPORT");