RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-20 22:05:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #271 from raven02/patch-19

Browse source 
DbgConsole: hide debug console
This commit is contained in:
B1ackDaemon 2014-05-25 22:39:17 +03:00
commit ddd485fdad
4 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/Emu/DbgConsole.cpp
View file

@ -6,7 +6,7 @@ BEGIN_EVENT_TABLE(DbgConsole, FrameBase)
END_EVENT_TABLE()
DbgConsole::DbgConsole()
: FrameBase(nullptr, wxID_ANY, "DbgConsole", "", wxDefaultSize, wxDefaultPosition, wxDEFAULT_FRAME_STYLE, true)
: FrameBase(nullptr, wxID_ANY, "Debug Console", "", wxDefaultSize, wxDefaultPosition, wxDEFAULT_FRAME_STYLE, true)
, ThreadBase("DbgConsole thread")
, m_output(nullptr)
{
@ -91,4 +91,4 @@ void DbgConsole::OnQuit(wxCloseEvent& event)
}
//event.Skip();
}
}

5
rpcs3/Emu/SysCalls/lv2/SC_TTY.cpp
View file

@ -15,7 +15,10 @@ int sys_tty_write(u32 ch, u64 buf_addr, u32 len, u64 pwritelen_addr)
if(ch > 15 || (s32)len <= 0) return CELL_EINVAL;
if(!Memory.IsGoodAddr(buf_addr)) return CELL_EFAULT;
Emu.GetDbgCon().Write(ch, Memory.ReadString(buf_addr, len));
if (!Ini.HLEHideDebugConsole.GetValue())
{
Emu.GetDbgCon().Write(ch, Memory.ReadString(buf_addr, len));
}
if(!Memory.IsGoodAddr(pwritelen_addr)) return CELL_EFAULT;