Merge remote-tracking branch 'upstream/master'

Author: plotn

android/AndroidManifest.xml

@@ -4,7 +4,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.coolreader"
       android:installLocation="auto"
-      android:versionName="3.2.4-1" android:versionCode="2041">
+      android:versionName="3.2.6-1" android:versionCode="2061">
     <supports-screens
         android:xlargeScreens="true"
         android:largeScreens="true"

android/app/build.gradle

@@ -8,8 +8,8 @@ android {
         targetSdkVersion 26
         // When new version released, version code must be incremented at least by 8
         // for compatibility with ABI versioning of split apk (see below).
-        versionCode 2041
-        versionName "3.2.4-1"
+        versionCode 2061
+        versionName "3.2.6-1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {

android/src/org/coolreader/Dictionaries.java

@@ -179,13 +179,16 @@ public DictionaryException(String msg) {
 	public void findInDictionary(String s) throws DictionaryException {
 		log.d("lookup in dictionary: " + s);
 		DictInfo curDict = currentDictionary;
-		if (iDic2IsActive > 0)
+		if (iDic2IsActive > 0 && currentDictionary2 != null)
 			curDict = currentDictionary2;
 		if (iDic2IsActive > 1)
 			iDic2IsActive = 0;
 		if (currentDictionary3 != null)
 			curDict = currentDictionary3;
 		currentDictionary3 = null;
+		if (null == curDict) {
+			throw new DictionaryException("Current dictionary are invalid!");
+		}
 		switch (curDict.internal) {
 		case 0:
 			Intent intent0 = new Intent(curDict.action);