From: Keith Packard <keithp@keithp.com>
Date: Thu, 25 Jun 2015 19:23:04 +0000 (-0700)
Subject: altoslib: Don't crash if dragging a map view without any tiles
X-Git-Tag: 1.6.0.4~21
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=6ecd75a7abb5fcee440f7672082013088634680b;hp=06908e377b7b932bfe3f6dfc840a0a13340f32ce

altoslib: Don't crash if dragging a map view without any tiles

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/altoslib/AltosMap.java b/altoslib/AltosMap.java
index 8d12a180..d68cff7a 100644
--- a/altoslib/AltosMap.java
+++ b/altoslib/AltosMap.java
@@ -131,6 +131,10 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 		return (System.currentTimeMillis() - user_input_time) < auto_scroll_delay;
 	}
 
+	public boolean has_centre() {
+		return centre != null;
+	}
+
 	public boolean far_from_centre(AltosLatLon lat_lon) {
 
 		if (centre == null || transform == null)
@@ -423,8 +427,13 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 	}
 
 	private void drag_stop(int x, int y) {
-		if (!dragged)
+		if (!dragged) {
+			if (transform == null) {
+				debug("Transform not set in stop\n");
+				return;
+			}
 			map_interface.select_object (transform.screen_lat_lon(new AltosPointInt(x,y)));
+		}
 	}
 
 	private void line_start(int x, int y) {