diff --git a/src/dlangui/graphics/resources.d b/src/dlangui/graphics/resources.d index c5ec400a..ea148465 100644 --- a/src/dlangui/graphics/resources.d +++ b/src/dlangui/graphics/resources.d @@ -1091,13 +1091,14 @@ class DrawableCache { ~this() { debug(resalloc) Log.e("Drawable instace count before destroying of DrawableCache: ", ImageDrawable.instanceCount); - Log.i("Destroying DrawableCache _idToDrawableMap.length=", _idToDrawableMap.length); + //Log.i("Destroying DrawableCache _idToDrawableMap.length=", _idToDrawableMap.length); + Log.i("Destroying DrawableCache"); foreach (ref item; _idToDrawableMap) { destroy(item); item = null; } _idToDrawableMap.destroy(); - debug(resalloc) Log.e("Drawable instace count after destroying of DrawableCache: ", ImageDrawable.instanceCount); + debug if(ImageDrawable.instanceCount) Log.e("Drawable instace count after destroying of DrawableCache: ", ImageDrawable.instanceCount); } } diff --git a/src/dlangui/platforms/sdl/sdlapp.d b/src/dlangui/platforms/sdl/sdlapp.d index ce212540..7d551d19 100644 --- a/src/dlangui/platforms/sdl/sdlapp.d +++ b/src/dlangui/platforms/sdl/sdlapp.d @@ -1371,6 +1371,9 @@ int sdlmain(string[] args) { if (ImageDrawable.instanceCount > 0) { Log.e("Non-zero ImageDrawable instance count when exiting: ", ImageDrawable.instanceCount); } + if (Drawable.instanceCount > 0) { + Log.e("Non-zero Drawable instance count when exiting: ", Drawable.instanceCount); + } version (USE_FREETYPE) { if (FreeTypeFontFile.instanceCount > 0) { Log.e("Non-zero FreeTypeFontFile instance count when exiting: ", FreeTypeFontFile.instanceCount); diff --git a/src/dlangui/platforms/windows/winapp.d b/src/dlangui/platforms/windows/winapp.d index 5cebd562..346da96e 100644 --- a/src/dlangui/platforms/windows/winapp.d +++ b/src/dlangui/platforms/windows/winapp.d @@ -1021,6 +1021,35 @@ int myWinMain(void* hInstance, void* hPrevInstance, char* lpCmdLine, int iCmdSho Log.i("Entering UIAppMain: ", args); int result = UIAppMain(args); Log.i("UIAppMain returned ", result); + + debug { + if (DrawBuf.instanceCount > 0) { + Log.e("Non-zero DrawBuf instance count when exiting: ", DrawBuf.instanceCount); + } + if (Style.instanceCount > 0) { + Log.e("Non-zero Style instance count when exiting: ", Style.instanceCount); + } + if (Widget.instanceCount() > 0) { + Log.e("Non-zero Widget instance count when exiting: ", Widget.instanceCount); + } + if (ImageDrawable.instanceCount > 0) { + Log.e("Non-zero ImageDrawable instance count when exiting: ", ImageDrawable.instanceCount); + } + if (Drawable.instanceCount > 0) { + Log.e("Non-zero Drawable instance count when exiting: ", Drawable.instanceCount); + } + version (USE_FREETYPE) { + import dlangui.graphics.ftfonts; + if (FreeTypeFontFile.instanceCount > 0) { + Log.e("Non-zero FreeTypeFontFile instance count when exiting: ", FreeTypeFontFile.instanceCount); + } + if (FreeTypeFont.instanceCount > 0) { + Log.e("Non-zero FreeTypeFont instance count when exiting: ", FreeTypeFont.instanceCount); + } + } + } + Log.d("Exiting main"); + return result; }