From: John Hodge Date: Wed, 21 Apr 2010 13:50:07 +0000 (+0800) Subject: Fixed case where the screen was cleared during a panic X-Git-Tag: rel0.06~228 X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=4ffd060057b4c41b63ca1b1e2a48bfc7abc44c30;p=tpg%2Facess2.git Fixed case where the screen was cleared during a panic --- diff --git a/Kernel/Makefile.BuildNum b/Kernel/Makefile.BuildNum index 99e449bb..1feb3bdc 100644 --- a/Kernel/Makefile.BuildNum +++ b/Kernel/Makefile.BuildNum @@ -1 +1 @@ -BUILD_NUM = 1959 +BUILD_NUM = 1960 diff --git a/Kernel/arch/x86/kpanic.c b/Kernel/arch/x86/kpanic.c index 865b0d3b..1972fd3b 100644 --- a/Kernel/arch/x86/kpanic.c +++ b/Kernel/arch/x86/kpanic.c @@ -59,6 +59,9 @@ void KernelPanic_SetMode() { int i; + // Some routines call this function twice, let's avoid that, shall we? + if( giKP_Pos ) return ; + // Restore VGA 0xB8000 text mode #if 1 for( i = 0; i < NUM_REGVALUES; i++ )