From 57c66798fc533d84534c23757ba325c5598798f3 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Thu, 12 Feb 2015 18:41:52 -0600 Subject: [PATCH] [Android] Register panic alert handler. This lets me see _assert_msg_ alerts on Android when passing dumb arguments to my AArch64 emitter. --- Source/Core/DolphinWX/MainAndroid.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Source/Core/DolphinWX/MainAndroid.cpp b/Source/Core/DolphinWX/MainAndroid.cpp index 0d9d4428ce..89ebc8837d 100644 --- a/Source/Core/DolphinWX/MainAndroid.cpp +++ b/Source/Core/DolphinWX/MainAndroid.cpp @@ -105,6 +105,12 @@ void Host_SetWiiMoteConnectionState(int _State) {} void Host_ShowVideoConfig(void*, const std::string&, const std::string&) {} +static bool MsgAlert(const char* caption, const char* text, bool /*yes_no*/, int /*Style*/) +{ + __android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "%s:%s", caption, text); + return false; +} + #define DVD_BANNER_WIDTH 96 #define DVD_BANNER_HEIGHT 32 std::vector m_volume_names; @@ -344,6 +350,8 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Run(JNIEnv * OSD::AddCallback(OSD::OSD_INIT, ButtonManager::Init); OSD::AddCallback(OSD::OSD_SHUTDOWN, ButtonManager::Shutdown); + RegisterMsgAlertHandler(&MsgAlert); + UICommon::Init(); // No use running the loop when booting fails