X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosViewPager.java;h=e8299b09aeda4f2de7f6f0d334b7cbda14c545b4;hp=ebddc2661023a1d960a90eec0b3606104bbd4652;hb=7975d088a4ac44c0943134fa41d0e3b88f50b98f;hpb=d029acad6a992be9b7b4498e70605f8a1e1a4ef6

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosViewPager.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosViewPager.java
index ebddc266..e8299b09 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosViewPager.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosViewPager.java
@@ -34,10 +34,17 @@ public class AltosViewPager extends ViewPager {
 
     @Override
     protected boolean canScroll(View v, boolean checkV, int dx, int x, int y) {
-        if(v.getClass().getPackage().getName().startsWith("maps.")){
+	if (v.getClass().getName().endsWith("MapView"))
+	    return true;
+
+	if(v.getClass() != null &&
+	   v.getClass().getPackage() != null &&
+	   v.getClass().getPackage().getName() != null &&
+	   v.getClass().getPackage().getName().startsWith("maps."))
+	{
             return true;
         }
         return super.canScroll(v, checkV, dx, x, y);
     }
 
-}
\ No newline at end of file
+}