Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ANDROID: Remove duplicate _system->quit() from JNI::Destroy()
Since it is already called in Jni::main after scummvm_main() returns. The second call in destroy caused crashes on some devices.
- Loading branch information
1 parent
d39eca7
commit b4b9ad1
Showing
1 changed file
with
0 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -562,7 +562,6 @@ void JNI::destroy(JNIEnv *env, jobject self) { | |
delete _asset_archive; | ||
_asset_archive = 0; | ||
|
||
_system->quit(); | ||
delete _system; | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
antoniou79
Author
Contributor
|
||
g_system = 0; | ||
_system = 0; | ||
|
Is
_system
something that derives fromCommon::OSystem
? If so you might want to call_system->destroy()
instead of doingdelete _system
(otherwise you might have mutex issues if a Common::String is used after this point).