From 4c41a8834d3778785377606297f93bf5e9dd6c06 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 5 Jul 2021 23:23:30 +0200 Subject: [PATCH] Fix some logging mistake --- LogManager.cpp | 17 ++++++++++------- ResourceManager.cpp | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/LogManager.cpp b/LogManager.cpp index a1ec5c39..7c547015 100644 --- a/LogManager.cpp +++ b/LogManager.cpp @@ -232,14 +232,17 @@ void LogManager::_append(const char* filename, int line, unsigned int level, con /*-------------------------------------------------*\ | If the message level is LL_WARNING or lower, add | | it to the error queue | + | | + | Commented out - It is causing OpenRGB to crash | + | according to #1537 | \*-------------------------------------------------*/ - if(level <= LL_WARNING) - { - for(size_t idx = 0; idx < error_callbacks.size(); ++idx) - { - error_callbacks[idx].first(error_callbacks[idx].second, mes); - } - } + //if(level <= LL_WARNING) + //{ + // for(size_t idx = 0; idx < error_callbacks.size(); ++idx) + // { + // error_callbacks[idx].first(error_callbacks[idx].second, mes); + // } + //} } void LogManager::append(const char* filename, int line, unsigned int level, const char* fmt, ...) diff --git a/ResourceManager.cpp b/ResourceManager.cpp index 2b4a1023..8fb58e18 100644 --- a/ResourceManager.cpp +++ b/ResourceManager.cpp @@ -899,7 +899,7 @@ void ResourceManager::DetectDevicesThreadFunction() { const char* manu_name = wchar_to_char(current_hid_device->manufacturer_string); const char* prod_name = wchar_to_char(current_hid_device->product_string); - LOG_DEBUG("[%04X:%04X U=%3X P=0x%04X I=%d] %-25s - %s", current_hid_device->vendor_id, current_hid_device->product_id, current_hid_device->usage, current_hid_device->usage_page, current_hid_device->interface_number, manu_name, prod_name); + LOG_DEBUG("[%04X:%04X U=%04X P=0x%04X I=%d] %-25s - %s", current_hid_device->vendor_id, current_hid_device->product_id, current_hid_device->usage, current_hid_device->usage_page, current_hid_device->interface_number, manu_name, prod_name); } detection_string = ""; DetectionProgressChanged();