From e527170315cb9d7b2070db0505590f6aff016f96 Mon Sep 17 00:00:00 2001
From: Sandor Dornbush <Sandor Dornbush@localhost>
Date: Thu, 7 Oct 2010 12:01:32 -0700
Subject: [PATCH] Fix recording error.

---
 .../apps/mytracks/services/PreferenceManager.java        | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/PreferenceManager.java b/MyTracks/src/com/google/android/apps/mytracks/services/PreferenceManager.java
index 9d4af469f..77e7e7f04 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/PreferenceManager.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/PreferenceManager.java
@@ -135,8 +135,13 @@ public class PreferenceManager {
           MyTracksSettings.DEFAULT_AUTO_RESUME_TRACK_TIMEOUT));
     }
     if (key == null || key.equals(recordingTrackKey)) {
-      service.setRecordingTrackId(
-          sharedPreferences.getLong(recordingTrackKey, -1));
+      long recordingTrackId = sharedPreferences.getLong(recordingTrackKey, -1);
+      // Only read the id if it is valid.
+      // Setting it to -1 should only happen in 
+      // TrackRecordingService.endCurrentTrack()
+      if (recordingTrackId > 0) {
+        service.setRecordingTrackId(recordingTrackId);
+      }
     }
     if (key == null || key.equals(splitFrequencyKey)) {
       service.getSplitManager().setSplitFrequency(