Merge tag '1.4' into fox

tagging 1.4 release

Conflicts:
	src/Makefile

1 files changed, 6 insertions, 2 deletions

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosViewPager.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosViewPager.java
index ebddc266..223ae75a 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosViewPager.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosViewPager.java
@@ -34,10 +34,14 @@ 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() != 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
+}