The CurrentNumberOfxxxxx should be based on the device going away, and not the next (or empty) device in the list.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11000 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 2 insertions, 2 deletions

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
index d4f480943b..92d677d2c1 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
@@ -3133,14 +3133,14 @@ ConSplitterTextOutDeleteDevice (
   TextOutList           = Private->TextOutList;

   while (Index >= 0) {

     if (TextOutList->TextOut == TextOut) {

-      CopyMem (TextOutList, TextOutList + 1, sizeof (TEXT_OUT_AND_GOP_DATA) * Index);

-      CurrentNumOfConsoles--;

       if (TextOutList->UgaDraw != NULL && FeaturePcdGet (PcdUgaConsumeSupport)) {

         Private->CurrentNumberOfUgaDraw--;

       }

       if (TextOutList->GraphicsOutput != NULL) {

         Private->CurrentNumberOfGraphicsOutput--;

       }

+      CopyMem (TextOutList, TextOutList + 1, sizeof (TEXT_OUT_AND_GOP_DATA) * Index);

+      CurrentNumOfConsoles--;

       break;

     }