diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 075ed3b95..7251c638c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,7 +2,7 @@ diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextView.java b/src/org/geometerplus/zlibrary/text/view/ZLTextView.java index 56d93db2e..9662ad252 100644 --- a/src/org/geometerplus/zlibrary/text/view/ZLTextView.java +++ b/src/org/geometerplus/zlibrary/text/view/ZLTextView.java @@ -376,9 +376,12 @@ public abstract class ZLTextView extends ZLTextViewBase { private float distance2ToCursor(int x, int y, SelectionCursor.Which which) { final ZLTextSelection.Point point = getSelectionCursorPoint(myCurrentPage, which); + if (point == null) { + return Floor.MAX_VALUE; + } final float dX = x - point.X; final float dY = y - point.Y; - return point != null ? dX * dX + dY * dY : Float.MAX_VALUE; + return dX * dX + dY * dY; } protected SelectionCursor.Which findSelectionCursor(int x, int y) {