archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-13 10:18:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #988 from Bigpet/restore_threadlist

Browse source 
re-enable threadlist in GUI
This commit is contained in:
B1ackDaemon 2015-02-02 13:11:20 +02:00
commit fbee6d4017
2 changed files with 6 additions and 6 deletions
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); CPUThread& AddThread(CPUThreadType type);
void RemoveThread(const u32 id); 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); s32 GetThreadNumById(CPUThreadType type, u32 id);
std::shared_ptr<CPUThread> GetThread(u32 id); std::shared_ptr<CPUThread> GetThread(u32 id);
std::shared_ptr<CPUThread> GetThread(u32 id, CPUThreadType type); 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->Freeze();
m_choice_units->Clear(); m_choice_units->Clear();
//auto& thrs = Emu.GetCPU().GetThreads(); auto thrs = Emu.GetCPU().GetThreads();
//for (auto& t : thrs) for (auto& t : thrs)
//{ {
// m_choice_units->Append(t->GetFName(), t.get()); m_choice_units->Append(t->GetFName(), t.get());
//} }
m_choice_units->Thaw(); m_choice_units->Thaw();
} }