Few warnings fixed

This commit is contained in:
Nekotekina 2014-10-24 17:24:09 +04:00
parent 973e3f8f7e
commit 6df5ddb973
15 changed files with 720 additions and 159 deletions

View file

@ -240,7 +240,7 @@ void Emulator::Load()
try
{
if(!(is_error = !l.Analyze()) && l.GetMachine() != MACHINE_Unknown)
if(!(is_error = !l.Analyze()))
{
switch(l.GetMachine())
{
@ -260,6 +260,9 @@ void Emulator::Load()
case MACHINE_ARM:
Memory.Init(Memory_PSV);
break;
default:
throw std::string("Unknown machine!");
}
is_error = !l.Load();