diff --git a/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV2Controller.cpp b/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV2Controller.cpp index 3f2fe9da..d3bf85da 100644 --- a/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV2Controller.cpp +++ b/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV2Controller.cpp @@ -14,6 +14,7 @@ #include #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) { @@ -97,8 +98,8 @@ std::string CMKeyboardV2Controller::_GetFirmwareVersion() cVersionStr[i++] = it; } - std::u16string usFirmwareVersion(reinterpret_cast(cVersionStr+8)); - std::string sFirmwareVersion(usFirmwareVersion.begin(), usFirmwareVersion.end()); + std::wstring wsFirmwareVersion(reinterpret_cast(cVersionStr+8)); + std::string sFirmwareVersion(StringUtils::wstring_to_string(wsFirmwareVersion)); LOG_VERBOSE("[%s] GetFirmwareVersion(): [%s]", m_deviceName.c_str(), sFirmwareVersion.c_str());