From 0448971a1c6d2873899f55f39f9830cdc355300d Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Sat, 3 Mar 2012 09:42:22 +0000 Subject: [PATCH] fixed crash in native code --- jni/NativeFormats/JavaNativeFormatPlugin.cpp | 3 +-- jni/NativeFormats/main.cpp | 9 ++++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/jni/NativeFormats/JavaNativeFormatPlugin.cpp b/jni/NativeFormats/JavaNativeFormatPlugin.cpp index 939859637..82ebfd461 100644 --- a/jni/NativeFormats/JavaNativeFormatPlugin.cpp +++ b/jni/NativeFormats/JavaNativeFormatPlugin.cpp @@ -86,9 +86,8 @@ JNIEXPORT jboolean JNICALL Java_org_geometerplus_fbreader_formats_NativeFormatPl return JNI_FALSE; } - return JNI_FALSE; - shared_ptr book = Book::loadFromJavaBook(env, javaBook); + if (!plugin->readMetaInfo(*book)) { return JNI_FALSE; } diff --git a/jni/NativeFormats/main.cpp b/jni/NativeFormats/main.cpp index dd91021f4..a08863422 100644 --- a/jni/NativeFormats/main.cpp +++ b/jni/NativeFormats/main.cpp @@ -21,8 +21,15 @@ #include +#include + extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *jvm, void *reserved) { - AndroidUtil::init(jvm); + if (AndroidUtil::init(jvm)) { + int argc = 0; + char **argv = 0; + ZLibrary::init(argc, argv); + ZLibrary::initApplication("FBReader"); + } return JNI_VERSION_1_2; }