Merge branch 'master' of [email protected]:acess2

[tpg/acess2.git] / Kernel / arch / x86 / kpanic.c

diff --git a/Kernel/arch/x86/kpanic.c b/Kernel/arch/x86/kpanic.c
index 865b0d3..798c513 100644 (file)
--- a/Kernel/arch/x86/kpanic.c
+++ b/Kernel/arch/x86/kpanic.c
@@ -59,6 +59,11 @@ void KernelPanic_SetMode()
 {
         int    i;
        
+       // This function is called by Panic(), but MM_PageFault and the
+       // CPU exception handers also call it, so let's not clear the screen
+       // twice
+       if( giKP_Pos )  return ;
+       
        // Restore VGA 0xB8000 text mode
        #if 1
        for( i = 0; i < NUM_REGVALUES; i++ )