fix #4381: no caches nearby after restart

The low-power observable, which combines the initial location with an
observable trying to get an acceptable location, was stuck if no
initial location could be acquired at all. Merging instead of
concatenating will allow the observable to go forward.

1 files changed, 1 insertions, 1 deletions

diff --git a/main/src/cgeo/geocaching/playservices/LocationProvider.java b/main/src/cgeo/geocaching/playservices/LocationProvider.java
index f235a3b..4c7a70e 100644
--- a/main/src/cgeo/geocaching/playservices/LocationProvider.java
+++ b/main/src/cgeo/geocaching/playservices/LocationProvider.java
@@ -111,7 +111,7 @@ public class LocationProvider implements ConnectionCallbacks, OnConnectionFailed
                 return geoData.getAccuracy() < 20;
             }
         }));
-        return initialLocationObservable.concatWith(lowPowerObservable.ambWith(gpsFixObservable.delaySubscription(6, TimeUnit.SECONDS)).first()
+        return initialLocationObservable.mergeWith(lowPowerObservable.ambWith(gpsFixObservable.delaySubscription(6, TimeUnit.SECONDS)).first()
                 .concatWith(lowPowerObservable).timeout(25, TimeUnit.SECONDS).retry());
     }