summaryrefslogtreecommitdiff
path: root/Source/Android/jni/MainAndroid.cpp
diff options
context:
space:
mode:
authorLéo Lam <leo@innovatetechnologi.es>2019-06-20 13:37:24 +0200
committerGitHub <noreply@github.com>2019-06-20 13:37:24 +0200
commit4885130799a357eee8e279ed68dac60d6bcd78ca (patch)
tree01260bc72811143b0153b747d0d8b860638325eb /Source/Android/jni/MainAndroid.cpp
parentbaf02194c1bf4a55620e3aee7d9c0a1658a61168 (diff)
parent4f1f55093fcf98aa1592b6b8b1ad0d33c4461b50 (diff)
Merge pull request #8194 from lioncash/common-msg
Common/MsgHandler: Tidy up interface and namespace code
Diffstat (limited to 'Source/Android/jni/MainAndroid.cpp')
-rw-r--r--Source/Android/jni/MainAndroid.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp
index e0f305693b..8dad714a84 100644
--- a/Source/Android/jni/MainAndroid.cpp
+++ b/Source/Android/jni/MainAndroid.cpp
@@ -151,7 +151,7 @@ void Host_TitleChanged()
{
}
-static bool MsgAlert(const char* caption, const char* text, bool yes_no, MsgType /*style*/)
+static bool MsgAlert(const char* caption, const char* text, bool yes_no, Common::MsgType /*style*/)
{
JNIEnv* env = IDCache::GetEnvForThread();
@@ -630,7 +630,7 @@ static void Run(JNIEnv* env, const std::vector<std::string>& paths, bool first_o
ASSERT(!paths.empty());
__android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Running : %s", paths[0].c_str());
- RegisterMsgAlertHandler(&MsgAlert);
+ Common::RegisterMsgAlertHandler(&MsgAlert);
Common::AndroidSetReportHandler(&ReportSend);
DolphinAnalytics::AndroidSetGetValFunc(&GetAnalyticValue);