ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Watches: Fix Save and Load from strings

This commit is contained in:
Sepalani 2021-03-04 17:55:52 +04:00
parent be500a98e2
commit 6786340a7c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Common/Debug/Watches.cpp
View File

@ -5,6 +5,7 @@
#include "Common/Debug/Watches.h" #include "Common/Debug/Watches.h"
#include <algorithm> #include <algorithm>
#include <locale>
#include <sstream> #include <sstream>
namespace Common::Debug namespace Common::Debug
@ -88,11 +89,11 @@ void Watches::LoadFromStrings(const std::vector<std::string>& watches)
{ {
for (const std::string& watch : watches) for (const std::string& watch : watches)
{ {
std::stringstream ss; std::istringstream ss(watch);
ss.imbue(std::locale::classic());
u32 address; u32 address;
std::string name; std::string name;
ss << std::hex << watch; ss >> std::hex >> address;
ss >> address;
ss >> std::ws; ss >> std::ws;
std::getline(ss, name); std::getline(ss, name);
SetWatch(address, name); SetWatch(address, name);
@ -105,6 +106,7 @@ std::vector<std::string> Watches::SaveToStrings() const
for (const auto& watch : m_watches) for (const auto& watch : m_watches)
{ {
std::ostringstream ss; std::ostringstream ss;
ss.imbue(std::locale::classic());
ss << std::hex << watch.address << " " << watch.name; ss << std::hex << watch.address << " " << watch.name;
watches.push_back(ss.str()); watches.push_back(ss.str());
} }