From d0b5faf266e9e88b0c52feffb5decd011c34276a Mon Sep 17 00:00:00 2001
From: Rodrigo Damazio <Rodrigo Damazio@localhost>
Date: Thu, 30 Jun 2011 02:24:34 -0300
Subject: [PATCH] Fixing a couple of race conditions.

---
 .../src/com/google/android/apps/mytracks/StatsActivity.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java
index d8d9b4bef..1fe74c7c3 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java
@@ -53,7 +53,7 @@ public class StatsActivity extends Activity implements TrackDataListener {
    */
   private final Runnable updateResults = new Runnable() {
     public void run() {
-      if (dataHub.isRecordingSelected()) {
+      if (dataHub != null && dataHub.isRecordingSelected()) {
         utils.setTime(R.id.total_time_register,
             System.currentTimeMillis() - startTime);
       }
@@ -301,6 +301,7 @@ public class StatsActivity extends Activity implements TrackDataListener {
 
   @Override
   public void onTrackUpdated(final Track track) {
+    final boolean recordingSelected = dataHub.isRecordingSelected();
     runOnUiThread(new Runnable() {
       @Override
       public void run() {
@@ -310,7 +311,7 @@ public class StatsActivity extends Activity implements TrackDataListener {
         }
 
         startTime = track.getStatistics().getStartTime();
-        if (!dataHub.isRecordingSelected()) {
+        if (!recordingSelected) {
           utils.setTime(R.id.total_time_register,
               track.getStatistics().getTotalTime());
           showUnknownLocation();