From 470adc0186bde2e1b866a731d375147ba162b501 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Mon, 13 May 2013 22:28:29 +1200
Subject: [PATCH] Fix onDestroy crash (fix #29)

---
 src/org/traccar/client/TraccarService.java | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/org/traccar/client/TraccarService.java b/src/org/traccar/client/TraccarService.java
index deb2b8a..368a785 100644
--- a/src/org/traccar/client/TraccarService.java
+++ b/src/org/traccar/client/TraccarService.java
@@ -82,11 +82,17 @@ public class TraccarService extends Service {
     public void onDestroy() {
         StatusActivity.addMessage(getString(R.string.status_service_destroy));
 
-        sharedPreferences.unregisterOnSharedPreferenceChangeListener(preferenceChangeListener);
+        if (sharedPreferences != null) {
+        	sharedPreferences.unregisterOnSharedPreferenceChangeListener(preferenceChangeListener);
+        }
 
-        positionProvider.stopUpdates();
+        if (positionProvider != null) {
+        	positionProvider.stopUpdates();
+        }
 
-        clientController.stop();
+        if (clientController != null) {
+        	clientController.stop();
+        }
     }
 
     private PositionProvider.PositionListener positionListener = new PositionProvider.PositionListener() {