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

Merge pull request #988 from Bigpet/restore_threadlist 

re-enable threadlist in GUI
This commit is contained in:
B1ackDaemon 2015-02-02 13:11:20 +02:00
parent 4c52b65374 13d2f8fa59
commit fbee6d4017
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpcs3/Emu/CPU/CPUThreadManager.h
View File

@ -18,7 +18,7 @@ public:
CPUThread& AddThread(CPUThreadType type);
void RemoveThread(const u32 id);
//std::vector<std::shared_ptr<CPUThread>>& GetThreads() { return m_threads; }
std::vector<std::shared_ptr<CPUThread>> GetThreads() { return m_threads; }
s32 GetThreadNumById(CPUThreadType type, u32 id);
std::shared_ptr<CPUThread> GetThread(u32 id);
std::shared_ptr<CPUThread> GetThread(u32 id, CPUThreadType type);

10
rpcs3/Gui/InterpreterDisAsm.cpp
View File

@ -108,12 +108,12 @@ void InterpreterDisAsmFrame::UpdateUnitList()
{
m_choice_units->Freeze();
m_choice_units->Clear();
//auto& thrs = Emu.GetCPU().GetThreads();
auto thrs = Emu.GetCPU().GetThreads();
//for (auto& t : thrs)
//{
// m_choice_units->Append(t->GetFName(), t.get());
//}
for (auto& t : thrs)
{
m_choice_units->Append(t->GetFName(), t.get());
}
m_choice_units->Thaw();
}