Check the handle for font package before remove it.

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

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
index ff4b0c209a0792428ec699a2e0175b86d56694c2..11d1c764a84d39929640597b5bf344e4b9cba4e8 100644 (file)
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
@@ -618,12 +618,10 @@ GraphicsConsoleControllerDriverStop (
     //\r
     // Remove the font pack\r
     //\r
-#if 1\r
-    HiiLibRemovePackages (Private->HiiHandle);\r
-    mFirstAccessFlag = TRUE;\r
-#else    \r
-    mHii->RemovePack (mHii, Private->HiiHandle);\r
-#endif\r
+    if (Private->HiiHandle != NULL) {\r
+      HiiLibRemovePackages (Private->HiiHandle);\r
+      mFirstAccessFlag = TRUE;\r
+    }\r
 \r
     //\r
     // Free our instance data\r