Commit 578afd6b authored by Chen Bill's avatar Chen Bill Committed by GitHub

return unknown_string in DataManager::GetSetName (#2650)

parent f4e0ddc2
...@@ -260,7 +260,7 @@ const wchar_t* DataManager::GetCounterName(int code) const { ...@@ -260,7 +260,7 @@ const wchar_t* DataManager::GetCounterName(int code) const {
const wchar_t* DataManager::GetSetName(int code) const { const wchar_t* DataManager::GetSetName(int code) const {
auto csit = _setnameStrings.find(code); auto csit = _setnameStrings.find(code);
if(csit == _setnameStrings.end()) if(csit == _setnameStrings.end())
return nullptr; return unknown_string;
return csit->second.c_str(); return csit->second.c_str();
} }
std::vector<unsigned int> DataManager::GetSetCodes(std::wstring setname) const { std::vector<unsigned int> DataManager::GetSetCodes(std::wstring setname) const {
...@@ -356,11 +356,9 @@ std::wstring DataManager::FormatSetName(const uint16_t setcode[]) const { ...@@ -356,11 +356,9 @@ std::wstring DataManager::FormatSetName(const uint16_t setcode[]) const {
if (!setcode[i]) if (!setcode[i])
break; break;
const wchar_t* setname = GetSetName(setcode[i]); const wchar_t* setname = GetSetName(setcode[i]);
if(setname) { if (!buffer.empty())
if (!buffer.empty()) buffer.push_back(L'|');
buffer.push_back(L'|'); buffer.append(setname);
buffer.append(setname);
}
} }
if (buffer.empty()) if (buffer.empty())
return std::wstring(unknown_string); return std::wstring(unknown_string);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment