diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2014-04-02 13:14:33 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2014-04-02 13:14:33 +0200 |
| commit | cd2a50e1e859527b9e2f768a0a5cb87a6cd42e2b (patch) | |
| tree | 805e8d6eb16f3cabe5decac3c2c09666c9941de0 /main/src | |
| parent | b674157bf100ee5d1616b104f49a26631c9ba1f6 (diff) | |
| parent | 8b8dc680031797c0d924ea2cc272745731d627fb (diff) | |
| download | cgeo-cd2a50e1e859527b9e2f768a0a5cb87a6cd42e2b.zip cgeo-cd2a50e1e859527b9e2f768a0a5cb87a6cd42e2b.tar.gz cgeo-cd2a50e1e859527b9e2f768a0a5cb87a6cd42e2b.tar.bz2 | |
Merge branch 'release' into upstream
Diffstat (limited to 'main/src')
| -rw-r--r-- | main/src/cgeo/geocaching/speech/SpeechService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/main/src/cgeo/geocaching/speech/SpeechService.java b/main/src/cgeo/geocaching/speech/SpeechService.java index 5cf732c..681c449 100644 --- a/main/src/cgeo/geocaching/speech/SpeechService.java +++ b/main/src/cgeo/geocaching/speech/SpeechService.java @@ -18,6 +18,7 @@ import android.os.IBinder; import android.speech.tts.TextToSpeech; import android.speech.tts.TextToSpeech.Engine; import android.speech.tts.TextToSpeech.OnInitListener; +import rx.subscriptions.Subscriptions; import java.util.Locale; @@ -76,7 +77,7 @@ public class SpeechService extends Service implements OnInitListener { private long lastSpeechTime = 0; private float lastSpeechDistance = 0.0f; private Geopoint target; - private Subscription initSubscription; + private Subscription initSubscription = Subscriptions.empty(); @Override public IBinder onBind(Intent intent) { |