diff --git a/pcsx2/Elfheader.cpp b/pcsx2/Elfheader.cpp index e2a9fa7eb0..1006d19ffd 100644 --- a/pcsx2/Elfheader.cpp +++ b/pcsx2/Elfheader.cpp @@ -501,21 +501,21 @@ struct ElfObject void ElfApplyPatches() { - if( !Config.Patch ) return; - string filename; ssprintf( filename, "%8.8x", params ElfCRC ); // if patches found the following status msg will be overwritten - Console::SetTitle( fmt_string( "Game running without patches. [CRC=%hs]", params &filename ) ); + Console::SetTitle( fmt_string( "Game running [CRC=%hs]", params &filename ) ); + + if( !Config.Patch ) return; if(LoadPatch( filename ) != 0) { - Console::WriteLn("XML Loader returned an error. Trying to load a pnatch..."); + Console::WriteLn("XML Loader returned an error. Trying to load a pnach..."); inifile_read( filename.c_str() ); } else - Console::WriteLn("XML Loading success. Will not load from pnatch..."); + Console::WriteLn("XML Loading success. Will not load from pnach..."); applypatch( 0 ); } diff --git a/pcsx2/System.cpp b/pcsx2/System.cpp index 7f3338cd9f..773d00e395 100644 --- a/pcsx2/System.cpp +++ b/pcsx2/System.cpp @@ -322,8 +322,8 @@ void SysResetExecutionState() R5900::Cpu->Reset(); psxCpu->Reset(); + vuMicroCpuReset(); + // make sure the VU1 doesn't have lingering "skip" enabled. vu1MicroDisableSkip(); - - vuMicroCpuReset(); } \ No newline at end of file diff --git a/pcsx2/VUmicroMem.cpp b/pcsx2/VUmicroMem.cpp index 99dd220edc..61a2e2bd8a 100644 --- a/pcsx2/VUmicroMem.cpp +++ b/pcsx2/VUmicroMem.cpp @@ -57,8 +57,8 @@ bool vu1MicroIsSkipping() void vuMicroCpuReset() { - CpuVU1 = CHECK_VU1REC ? &recVU1 : &intVU1; CpuVU0 = CHECK_VU0REC ? &recVU0 : &intVU0; + CpuVU1 = CHECK_VU1REC ? &recVU1 : &intVU1; CpuVU0->Reset(); CpuVU1->Reset();