Merge pull request #314 from berendn/patch-1

Added null-check per method in onStateChangedListener
davemorrissey · Oct 19, 2017 · 64038a1 · 64038a1
2 parents a589a84 + 8012bf7
commit 64038a1
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/library/src/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.java b/library/src/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.java
@@ -2660,13 +2660,11 @@ public void setOnStateChangedListener(OnStateChangedListener onStateChangedListe
     }
 
     private void sendStateChanged(float oldScale, PointF oldVTranslate, int origin) {
-        if (onStateChangedListener != null) {
-            if (scale != oldScale) {
-                onStateChangedListener.onScaleChanged(scale, origin);
-            }
-            if (!vTranslate.equals(oldVTranslate)) {
-                onStateChangedListener.onCenterChanged(getCenter(), origin);
-            }
+        if (onStateChangedListener != null && scale != oldScale) {
+            onStateChangedListener.onScaleChanged(scale, origin);
+        }
+        if (onStateChangedListener != null && !vTranslate.equals(oldVTranslate)) {
+            onStateChangedListener.onCenterChanged(getCenter(), origin);
         }
     }