Merge branch 'dev' of github.com:cbaines/SouthamptonUniversityMap into dev

Conflicts:
	assets/data.db
	src/net/cbaines/suma/BuildingActivity.java

2 files changed, 4 insertions, 5 deletions

diff --git a/src/net/cbaines/suma/BusStopActivity.java b/src/net/cbaines/suma/BusStopActivity.java
index b711770..6c46d03 100644
--- a/src/net/cbaines/suma/BusStopActivity.java
+++ b/src/net/cbaines/suma/BusStopActivity.java
@@ -265,11 +265,10 @@ public class BusStopActivity extends OrmLiteBaseActivity<DatabaseHelper> impleme
 		e.printStackTrace();
 	    }
 	} else {
-
 	    Log.i(TAG, "Route radio button made " + checked);
-
-	    displayTimetable(timetable);
-
+	    if (timetable != null) { // If there is a timetable to display
+		displayTimetable(timetable);
+	    }
 	}
     }
 
diff --git a/src/net/cbaines/suma/SouthamptonUniversityMapActivity.java b/src/net/cbaines/suma/SouthamptonUniversityMapActivity.java
index 1d99921..4bfb3de 100644
--- a/src/net/cbaines/suma/SouthamptonUniversityMapActivity.java
+++ b/src/net/cbaines/suma/SouthamptonUniversityMapActivity.java
@@ -76,7 +76,7 @@ import com.j256.ormlite.dao.Dao;
 public class SouthamptonUniversityMapActivity extends OrmLiteBaseActivity<DatabaseHelper> implements MapViewConstants, Runnable, RouteColorConstants,
 	OnChildClickListener, OnItemClickListener, OnItemLongClickListener, OnSharedPreferenceChangeListener, Preferences {
 
-    private boolean useBundledDatabase = true;
+    private boolean useBundledDatabase = false;
 
     private MapView mapView;
     private MapController mapController;