diff options
author | Max Kellermann <max@musicpd.org> | 2019-05-29 15:01:23 +0200 |
---|---|---|
committer | Max Kellermann <max@musicpd.org> | 2019-05-29 15:08:38 +0200 |
commit | c782fdb698a555fdfe6f37aeb9df46cbf633c8b1 (patch) | |
tree | 02f38279087ab8b56ce8e90c8c2ef0cd83e5d4f0 /src/Main.cxx | |
parent | 49ba76167e47c83fbf5bab591e003048f24a89ee (diff) |
Main: use AtScopeExit() to free Android objects
Diffstat (limited to 'src/Main.cxx')
-rw-r--r-- | src/Main.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Main.cxx b/src/Main.cxx index 777e748ff..473942296 100644 --- a/src/Main.cxx +++ b/src/Main.cxx @@ -640,16 +640,16 @@ Java_org_musicpd_Bridge_run(JNIEnv *env, jclass, jobject _context, jobject _logL Java::Object::Initialise(env); Java::File::Initialise(env); Environment::Initialise(env); + AtScopeExit(env) { Environment::Deinitialise(env); }; context = new Context(env, _context); + AtScopeExit() { delete context; }; + if (_logListener != nullptr) logListener = new LogListener(env, _logListener); + AtScopeExit() { delete logListener; }; mpd_main(0, nullptr); - - delete logListener; - delete context; - Environment::Deinitialise(env); } gcc_visibility_default |