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

Fixed GameViewer 

Disabled pause on null rsx instruction
This commit is contained in:
DHrpcs3 2014-11-29 16:16:48 +02:00
parent 95ce623da4
commit 2b7f984de8
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpcs3/Emu/FS/vfsLocalDir.cpp
View File

@ -21,7 +21,7 @@ bool vfsLocalDir::Open(const std::string& path)
std::string name;
for(bool is_ok = dir.GetFirst(&name); is_ok; is_ok = dir.GetNext(&name))
{
std::string dir_path = path + name;
std::string dir_path = path + "/" + name;
m_entries.emplace_back();
// TODO: Use same info structure as fileinfo?

2
rpcs3/Emu/RSX/RSXThread.cpp
View File

@ -2270,7 +2270,7 @@ void RSXThread::Task()
if(cmd == 0)
{
LOG_ERROR(Log::RSX, "null cmd: cmd=0x%x, put=0x%x, get=0x%x (addr=0x%x)", cmd, put, get, (u32)Memory.RSXIOMem.RealAddr(get));
Emu.Pause();
//Emu.Pause();
//HACK! We shouldn't be here
m_ctrl->get = get + (count + 1) * 4;
continue;

6
rpcs3/Gui/GameViewer.cpp
View File

@ -112,7 +112,7 @@ void GameViewer::LoadGames()
m_games.clear();
for(const DirEntryInfo* info = dir.Read(); info; info = dir.Read())
for(const DirEntryInfo* info : dir)
{
if(info->flags & DirEntry_TypeDir)
{
@ -182,7 +182,7 @@ void GameViewer::ShowData()
void GameViewer::Refresh()
{
Emu.GetVFS().Init(m_path);
Emu.GetVFS().Init("/");
LoadGames();
LoadPSF();
ShowData();
@ -210,7 +210,7 @@ void GameViewer::DClick(wxListEvent& event)
Debug::AutoPause::getInstance().Reload();
Emu.GetVFS().Init(path);
Emu.GetVFS().Init("/");
std::string local_path;
if (Emu.GetVFS().GetDevice(path, local_path) && !Emu.BootGame(local_path)) {
LOG_ERROR(HLE, "Boot error: elf not found! [%s]", path.c_str());

4
rpcs3/rpcs3.cpp
View File

@ -136,11 +136,11 @@ bool Rpcs3App::OnInit()
main_thread = std::this_thread::get_id();
Ini.Load();
m_MainFrame = new MainFrame();
SetTopWindow(m_MainFrame);
Emu.Init();
Emu.SetEmulatorPath(executablePath.ToStdString());
m_MainFrame = new MainFrame();
SetTopWindow(m_MainFrame);
m_MainFrame->Show();
m_MainFrame->DoSettings(true);