projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Don't crash if dragging a map view without any tiles
[fw/altos]
/
altoslib
/
AltosMap.java
diff --git
a/altoslib/AltosMap.java
b/altoslib/AltosMap.java
index 8d12a18094007c7cbf30b555c1a52acf49598227..d68cff7a6f99028791c1225336a6a8f7a2fae66a 100644
(file)
--- 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;
}
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)
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) {
}
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)));
map_interface.select_object (transform.screen_lat_lon(new AltosPointInt(x,y)));
+ }
}
private void line_start(int x, int y) {
}
private void line_start(int x, int y) {