From 5eaec4596a90d0d6ce468df912343037c13181e8 Mon Sep 17 00:00:00 2001 From: LoveSy Date: Sat, 1 Apr 2023 20:47:07 +0800 Subject: [PATCH] Refine zygisk api --- magisk-loader/src/main/jni/api/zygisk.h | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/magisk-loader/src/main/jni/api/zygisk.h b/magisk-loader/src/main/jni/api/zygisk.h index 42479c48..9cdb8d42 100644 --- a/magisk-loader/src/main/jni/api/zygisk.h +++ b/magisk-loader/src/main/jni/api/zygisk.h @@ -273,17 +273,13 @@ void zygisk_companion_entry(int client) { func(client); } template void entry_impl(api_table *table, JNIEnv *env) { - static T module{}; + static Api api; + api.impl = table; + static T module; ModuleBase *m = &module; static module_abi abi(m); - static bool loaded = table->registerModule(table, &abi); - if (!loaded) return; - [[maybe_unused]] static Api api = [&] { - Api api; - api.impl = table; - m->onLoad(&api, env); - return api; - }(); + if (!table->registerModule(table, &abi)) return; + m->onLoad(&api, env); } } // namespace internal