std::shared_ptr in IdManager

This commit is contained in:
Nekotekina 2014-12-24 02:38:13 +03:00
parent b2de24db73
commit d8239a39c9
47 changed files with 654 additions and 622 deletions

View file

@ -103,41 +103,41 @@ void Emulator::SetTitleID(const std::string& id)
void Emulator::CheckStatus()
{
std::vector<CPUThread *>& threads = GetCPU().GetThreads();
if (!threads.size())
{
Stop();
return;
}
//auto& threads = GetCPU().GetThreads();
//if (!threads.size())
//{
// Stop();
// return;
//}
bool IsAllPaused = true;
for (u32 i = 0; i < threads.size(); ++i)
{
if (threads[i]->IsPaused()) continue;
IsAllPaused = false;
break;
}
//bool IsAllPaused = true;
//for (u32 i = 0; i < threads.size(); ++i)
//{
// if (threads[i]->IsPaused()) continue;
// IsAllPaused = false;
// break;
//}
if(IsAllPaused)
{
//ConLog.Warning("all paused!");
Pause();
return;
}
//if(IsAllPaused)
//{
// //ConLog.Warning("all paused!");
// Pause();
// return;
//}
bool IsAllStoped = true;
for (u32 i = 0; i < threads.size(); ++i)
{
if (threads[i]->IsStopped()) continue;
IsAllStoped = false;
break;
}
//bool IsAllStoped = true;
//for (u32 i = 0; i < threads.size(); ++i)
//{
// if (threads[i]->IsStopped()) continue;
// IsAllStoped = false;
// break;
//}
if (IsAllStoped)
{
//ConLog.Warning("all stoped!");
Pause(); //Stop();
}
//if (IsAllStoped)
//{
// //ConLog.Warning("all stoped!");
// Pause(); //Stop();
//}
}
bool Emulator::BootGame(const std::string& path, bool direct, int device)