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

Fix wstring to string conversion in some Lian Li controllers

Browse source
This commit is contained in:
Adam Honse 2024-08-01 00:29:57 -05:00
parent 9b79a2263a
commit 24c6bb2f5f
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Controllers/LianLiController/LianLiGAIITrinityController/LianLiGAIITrinityController.cpp
View file

@ -14,6 +14,7 @@
#include <iomanip>
#include <sstream>
#include "LianLiGAIITrinityController.h"
#include "StringUtils.h"
LianLiGAIITrinityController::LianLiGAIITrinityController(hid_device* dev_handle)
{
@ -37,8 +38,7 @@ LianLiGAIITrinityController::GAII_Info LianLiGAIITrinityController::GetControlle
wchar_t tmp[sz];
hid_get_serial_number_string(dev, tmp, sz);
std::wstring serialWStr = std::wstring(tmp);
controllerInfo.serial = std::string(serialWStr.begin(), serialWStr.end());
controllerInfo.serial = StringUtils::wstring_to_string(tmp);
// get firmware version
unsigned char data[64] = "";

7
Controllers/LianLiController/LianLiUniHubALController/LianLiUniHubALController.cpp
View file

@ -12,6 +12,7 @@
#include <string.h>
#include "LianLiUniHubALController.h"
#include "StringUtils.h"
using namespace std::chrono_literals;
@ -43,8 +44,7 @@ std::string LianLiUniHubALController::GetFirmwareVersionString()
return ("");
}
std::wstring return_wstring = product_string;
std::string return_string(return_wstring.begin(),return_wstring.end());
std::string return_string = StringUtils::wstring_to_string(product_string);
return(return_string.substr(return_string.find_last_of("-")+1,4).c_str());
}
@ -64,8 +64,7 @@ std::string LianLiUniHubALController::GetSerialString()
return ("");
}
std::wstring return_wstring = serial_string;
std::string return_string(return_wstring.begin(), return_wstring.end());
std::string return_string = StringUtils::wstring_to_string(serial_string);
return(return_string);