jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert 8bf07f49 "Fix wstring to string conversion warning in CMKeyboardV2Controller.cpp"

Browse source 
* Linux throws a SIGABRT
This commit is contained in:
Chris 2024-08-25 12:43:35 +10:00 • committed by Adam Honse
parent 641c917605
commit c6fe58e635
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV2Controller.cpp
View file

@ -14,7 +14,6 @@
#include <string>
#include "CMKeyboardV2Controller.h"
#include "LogManager.h"
#include "StringUtils.h"
CMKeyboardV2Controller::CMKeyboardV2Controller(hid_device* dev_handle, hid_device_info* dev_info) : CMKeyboardAbstractController(dev_handle, dev_info)
{
@ -98,8 +97,8 @@ std::string CMKeyboardV2Controller::_GetFirmwareVersion()
cVersionStr[i++] = it;
}
std::wstring wsFirmwareVersion(reinterpret_cast<const wchar_t*>(cVersionStr+8));
std::string sFirmwareVersion(StringUtils::wstring_to_string(wsFirmwareVersion));
std::u16string usFirmwareVersion(reinterpret_cast<const char16_t*>(cVersionStr+8));
std::string sFirmwareVersion(usFirmwareVersion.begin(), usFirmwareVersion.end());
LOG_VERBOSE("[%s] GetFirmwareVersion(): [%s]", m_deviceName.c_str(), sFirmwareVersion.c_str());