diff --git a/Core/HLE/sceIo.cpp b/Core/HLE/sceIo.cpp index e8eb65d0ea..5508149e31 100644 --- a/Core/HLE/sceIo.cpp +++ b/Core/HLE/sceIo.cpp @@ -860,13 +860,14 @@ u32 sceIoDevctl(const char *name, int cmd, u32 argAddr, int argLen, u32 outPtr, case 2: // EMULATOR_DEVCTL__SEND_OUTPUT { std::string data(Memory::GetCharPointer(argAddr), argLen); - if (PSP_CoreParameter().printfEmuLog) - { + if (PSP_CoreParameter().printfEmuLog) { host->SendDebugOutput(data.c_str()); - } - if (PSP_CoreParameter().collectEmuLog) - { - *PSP_CoreParameter().collectEmuLog += data; + } else { + if (PSP_CoreParameter().collectEmuLog) { + *PSP_CoreParameter().collectEmuLog += data; + } else if (PSP_CoreParameter().collectEmuLog) { + DEBUG_LOG(HLE, "%s", data.c_str()); + } } return 0; } diff --git a/android/jni/TestRunner.h b/android/jni/TestRunner.h index b7b0c08a11..50f4546a6f 100644 --- a/android/jni/TestRunner.h +++ b/android/jni/TestRunner.h @@ -15,4 +15,6 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. +#pragma once + void RunTests();