Fixed conflicts

This commit is contained in:
Nekotekina 2014-02-26 15:27:06 +04:00
commit 8bd0ee875c
84 changed files with 864 additions and 1211 deletions

View file

@ -44,6 +44,10 @@ void DbgConsole::Task()
if(!m_dbg_buffer.HasNewPacket())
{
Sleep(1);
if (Emu.IsStopped())
{
break;
}
continue;
}