From 18d8e18bdf5eb3ae668f3ee5d4af7e391750fcee Mon Sep 17 00:00:00 2001
From: Emux <devemux86@gmail.com>
Date: Wed, 22 Mar 2017 21:34:52 +0200
Subject: [PATCH] Android samples: fix scale bar check on exit #32
---
.../src/org/oscim/android/test/LayerGroupActivity.java | 5 +++--
.../src/org/oscim/android/test/MapsforgeMapActivity.java | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/vtm-android-example/src/org/oscim/android/test/LayerGroupActivity.java b/vtm-android-example/src/org/oscim/android/test/LayerGroupActivity.java
index e706dde8..3dd404de 100644
--- a/vtm-android-example/src/org/oscim/android/test/LayerGroupActivity.java
+++ b/vtm-android-example/src/org/oscim/android/test/LayerGroupActivity.java
@@ -1,6 +1,6 @@
/*
* Copyright 2013 Hannes Janetzek
- * Copyright 2016 devemux86
+ * Copyright 2016-2017 devemux86
* Copyright 2016 Andrey Novikov
*
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
@@ -71,7 +71,8 @@ public class LayerGroupActivity extends BaseMapActivity {
@Override
protected void onDestroy() {
- mapScaleBar.destroy();
+ if (mapScaleBar != null)
+ mapScaleBar.destroy();
super.onDestroy();
}
diff --git a/vtm-android-example/src/org/oscim/android/test/MapsforgeMapActivity.java b/vtm-android-example/src/org/oscim/android/test/MapsforgeMapActivity.java
index f89f98f0..bd1785cc 100644
--- a/vtm-android-example/src/org/oscim/android/test/MapsforgeMapActivity.java
+++ b/vtm-android-example/src/org/oscim/android/test/MapsforgeMapActivity.java
@@ -58,7 +58,8 @@ public class MapsforgeMapActivity extends MapActivity {
@Override
protected void onDestroy() {
- mMapScaleBar.destroy();
+ if (mMapScaleBar != null)
+ mMapScaleBar.destroy();
super.onDestroy();
}