2 files changed, 11 insertions, 3 deletions
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
index 7838c54a70..9b0fe2fed4 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
@@ -4146,6 +4146,10 @@ ConSplitterTextOutOutputString (
 
   BackSpaceCount  = 0;
   for (TargetString = WString; *TargetString != L'\0'; TargetString++) {
+    if (*TargetString == L'a' && *(TargetString + 1) == L'b' && *(TargetString + 2) == L'c') {
+;//       CpuBreakpoint ();
+    }
+
     if (*TargetString == CHAR_BACKSPACE) {
       BackSpaceCount++;
     }
@@ -4173,8 +4177,10 @@ ConSplitterTextOutOutputString (
     }
   }
 
-  Private->TextOutMode.CursorColumn = Private->TextOutList[0].TextOut->Mode->CursorColumn;
-  Private->TextOutMode.CursorRow    = Private->TextOutList[0].TextOut->Mode->CursorRow;
+  if (Private->CurrentNumberOfConsoles > 0) {
+    Private->TextOutMode.CursorColumn = Private->TextOutList[0].TextOut->Mode->CursorColumn;
+    Private->TextOutMode.CursorRow    = Private->TextOutList[0].TextOut->Mode->CursorRow;
+  }
 
   if (BackSpaceCount > 0) {
     FreePool (TargetString);
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
index 31b8468e05..452f7a9c59 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
@@ -237,7 +237,7 @@ ConSpliterGraphicsOutputBlt (
   )
 {
   EFI_STATUS                      Status;
-  EFI_STATUS                      ReturnStatus = EFI_DEVICE_ERROR;
+  EFI_STATUS                      ReturnStatus;
   TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private;
   UINTN                           Index;
   EFI_GRAPHICS_OUTPUT_PROTOCOL    *GraphicsOutput;
@@ -245,6 +245,8 @@ ConSpliterGraphicsOutputBlt (
 
   Private = GRAPHICS_OUTPUT_SPLITTER_PRIVATE_DATA_FROM_THIS (This);
 
+  ReturnStatus = EFI_SUCCESS;
+
   //
   // return the worst status met
   //