From 3a7e0faff7ff44a08d414378ae61609d646b3891 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Tue, 22 Oct 2019 00:21:30 +0000
Subject: [PATCH] Core: Heap panic mode fixed

git-svn-id: svn://ultimatepp.org/upp/trunk@13651 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/Core/heapdbg.cpp |   4 +++-
 uppsrc/ide/icon.ico     | Bin 10134 -> 10134 bytes
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/uppsrc/Core/heapdbg.cpp b/uppsrc/Core/heapdbg.cpp
index de976eeeb..84437007b 100644
--- a/uppsrc/Core/heapdbg.cpp
+++ b/uppsrc/Core/heapdbg.cpp
@@ -149,7 +149,7 @@ bool MemoryTryRealloc_(void *ptr, size_t& newsize);
 
 bool MemoryTryRealloc__(void *ptr, size_t& newsize)
 {
-	if(!ptr) return false;
+	if(!ptr || PanicMode) return false;
 	Mutex::Lock __(sHeapLock2);
 	DbgBlkHeader *p = (DbgBlkHeader *)ptr - 1;
 	DbgCheck(p);
@@ -179,6 +179,8 @@ void  MemoryFree48(void *ptr)     { return MemoryFree(ptr); }
 
 void MemoryCheckDebug()
 {
+	if(PanicMode)
+		return;
 	MemoryCheck();
 	Mutex::Lock __(sHeapLock2);
 	DbgBlkHeader *p = dbg_live.next;
diff --git a/uppsrc/ide/icon.ico b/uppsrc/ide/icon.ico
index d59b7d36d886c79b9a0c7371d2f1d9d81b898ff1..8ff07a839ad055c6b7f0152a6a96360ac7e9de95 100644
GIT binary patch
delta 58
scmbQ{Kh1x`C1oKmCI&EI1d<JX?F?Q_lX+BSCo`)2#3HqsN41Ly0DHy@@&Et;

delta 58
rcmbQ{Kh1x`C1s)Wj0|7^q7q`?Gn{9f%%dthnNj5@7OBlVs$EO~xw{T9