From 2a7d8aa4d2e6ec35baccb3fbbfbb6494c741e3be Mon Sep 17 00:00:00 2001 From: Rosalie Wanders Date: Sat, 6 May 2023 00:49:29 +0200 Subject: [PATCH] RMG-Core: print callbacks even when callbacks haven't been setup --- Source/RMG-Core/Callback.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/RMG-Core/Callback.cpp b/Source/RMG-Core/Callback.cpp index c3c42c22..5297a70b 100644 --- a/Source/RMG-Core/Callback.cpp +++ b/Source/RMG-Core/Callback.cpp @@ -28,14 +28,19 @@ static bool l_PrintCallbacks = false; void CoreDebugCallback(void* context, int level, const char* message) { + std::string contextString((const char*)context); + std::string messageString(message); + + if (l_PrintCallbacks) + { + std::cout << contextString << messageString << std::endl; + } + if (!l_SetupCallbacks) { return; } - std::string contextString((const char*)context); - std::string messageString(message); - // convert string encoding accordingly if (messageString.starts_with("IS64:")) { @@ -46,11 +51,6 @@ void CoreDebugCallback(void* context, int level, const char* message) messageString = CoreConvertStringEncoding(message, CoreStringEncoding::Shift_JIS); } - if (l_PrintCallbacks) - { - std::cout << contextString << messageString << std::endl; - } - l_DebugCallbackFunc((CoreDebugMessageType)level, contextString, messageString); }