diff options
| author | Stenzek <stenzek@gmail.com> | 2018-10-10 01:26:31 +1100 |
|---|---|---|
| committer | Stenzek <stenzek@gmail.com> | 2019-01-25 11:15:57 +1000 |
| commit | 600d1fc0bc884644127057fa8cce5d31cbaef143 (patch) | |
| tree | 33a66054011e565b3b3e09bbca8df6f312ad8230 /Source/Android/jni/MainAndroid.cpp | |
| parent | d1868d9475db2ec99314a2f7f192a63fc40bf962 (diff) | |
Renderer: Use imgui for drawing debug text and OSD
Diffstat (limited to 'Source/Android/jni/MainAndroid.cpp')
| -rw-r--r-- | Source/Android/jni/MainAndroid.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index 686053496e..441080e57a 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -595,9 +595,6 @@ static void Run(const std::vector<std::string>& paths, bool first_open, ASSERT(!paths.empty()); __android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Running : %s", paths[0].c_str()); - // Install our callbacks - OSD::AddCallback(OSD::CallbackType::Shutdown, ButtonManager::Shutdown); - RegisterMsgAlertHandler(&MsgAlert); Common::AndroidSetReportHandler(&ReportSend); DolphinAnalytics::AndroidSetGetValFunc(&GetAnalyticValue); @@ -639,6 +636,7 @@ static void Run(const std::vector<std::string>& paths, bool first_open, } Core::Shutdown(); + ButtonManager::Shutdown(); UICommon::Shutdown(); guard.unlock(); |