From 5b6adad79b354df6c98061e76fa83ee25e02d7bd Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sat, 15 Sep 2012 11:24:54 +0400
Subject: [PATCH] Release 1.5

---
 AndroidManifest.xml                        | 4 ++--
 src/org/traccar/client/TraccarService.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 80f45c8..c9447b6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.traccar.client"
-      android:versionCode="5"
-      android:versionName="1.4">
+      android:versionCode="6"
+      android:versionName="1.5">
     <application android:label="@string/app_name" android:icon="@drawable/ic_launcher">
         <activity android:name="TraccarActivity"
                   android:label="@string/app_name"
diff --git a/src/org/traccar/client/TraccarService.java b/src/org/traccar/client/TraccarService.java
index 9863111..a0ef7b1 100644
--- a/src/org/traccar/client/TraccarService.java
+++ b/src/org/traccar/client/TraccarService.java
@@ -124,12 +124,12 @@ public class TraccarService extends Service implements LocationListener {
     @Override
     public void onDestroy() {
     	// Close connection
-    	if (connection) {
+    	if (connection != null) {
     		connection.close();
     	}
     	
     	// Stop location updates
-    	if (locationManager) {
+    	if (locationManager != null) {
     		locationManager.removeUpdates(this);
     	}