Merge branch 'trunk' into OLFDB-nightlayout-tunnelOLFDB-nightlayout-tunnel

34 files changed, 6 insertions, 4 deletions

diff --git a/fastlane/metadata/android/de_DE/full_description.txt b/fastlane/metadata/android/de-DE/full_description.txt
index 3c3efd6a3..3c3efd6a3 100644
--- a/fastlane/metadata/android/de_DE/full_description.txt
+++ b/fastlane/metadata/android/de-DE/full_description.txt
diff --git a/fastlane/metadata/android/de_DE/images/phoneScreenshots/1_de-DE.jpeg b/fastlane/metadata/android/de-DE/images/phoneScreenshots/1_de-DE.jpeg
index 6792d911b..6792d911b 100644
--- a/fastlane/metadata/android/de_DE/images/phoneScreenshots/1_de-DE.jpeg
+++ b/fastlane/metadata/android/de-DE/images/phoneScreenshots/1_de-DE.jpeg
diff --git a/fastlane/metadata/android/de_DE/images/phoneScreenshots/2_de-DE.jpeg b/fastlane/metadata/android/de-DE/images/phoneScreenshots/2_de-DE.jpeg
index 72a609cd2..72a609cd2 100644
--- a/fastlane/metadata/android/de_DE/images/phoneScreenshots/2_de-DE.jpeg
+++ b/fastlane/metadata/android/de-DE/images/phoneScreenshots/2_de-DE.jpeg
diff --git a/fastlane/metadata/android/de_DE/short_description.txt b/fastlane/metadata/android/de-DE/short_description.txt
index f5b38ca77..f5b38ca77 100644
--- a/fastlane/metadata/android/de_DE/short_description.txt
+++ b/fastlane/metadata/android/de-DE/short_description.txt
diff --git a/fastlane/metadata/android/de_DE/title.txt b/fastlane/metadata/android/de-DE/title.txt
index c0fbba6e0..c0fbba6e0 100644
--- a/fastlane/metadata/android/de_DE/title.txt
+++ b/fastlane/metadata/android/de-DE/title.txt
diff --git a/fastlane/metadata/android/de_DE/video.txt b/fastlane/metadata/android/de-DE/video.txt
index e69de29bb..e69de29bb 100644
--- a/fastlane/metadata/android/de_DE/video.txt
+++ b/fastlane/metadata/android/de-DE/video.txt
diff --git a/fastlane/metadata/android/en_US/changelogs/navit 0.5.1-1804161521.txt b/fastlane/metadata/android/en-US/changelogs/navit 0.5.1-1804161521.txt
index 4f3d19e29..4f3d19e29 100644
--- a/fastlane/metadata/android/en_US/changelogs/navit 0.5.1-1804161521.txt
+++ b/fastlane/metadata/android/en-US/changelogs/navit 0.5.1-1804161521.txt
diff --git a/fastlane/metadata/android/en_US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
index c1707e0f2..c1707e0f2 100644
--- a/fastlane/metadata/android/en_US/full_description.txt
+++ b/fastlane/metadata/android/en-US/full_description.txt
diff --git a/fastlane/metadata/android/en_US/images/featureGraphic.png b/fastlane/metadata/android/en-US/images/featureGraphic.png
index 5c766c722..5c766c722 100644
--- a/fastlane/metadata/android/en_US/images/featureGraphic.png
+++ b/fastlane/metadata/android/en-US/images/featureGraphic.png
diff --git a/fastlane/metadata/android/en_US/images/icon.png b/fastlane/metadata/android/en-US/images/icon.png
index b25e9f8d6..b25e9f8d6 100644
--- a/fastlane/metadata/android/en_US/images/icon.png
+++ b/fastlane/metadata/android/en-US/images/icon.png
diff --git a/fastlane/metadata/android/en_US/images/phoneScreenshots/3_en-US.jpeg b/fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.jpeg
index 91e3890fa..91e3890fa 100644
--- a/fastlane/metadata/android/en_US/images/phoneScreenshots/3_en-US.jpeg
+++ b/fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.jpeg
diff --git a/fastlane/metadata/android/en_US/images/phoneScreenshots/4_en-US.jpeg b/fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.jpeg
index b27c020bc..b27c020bc 100644
--- a/fastlane/metadata/android/en_US/images/phoneScreenshots/4_en-US.jpeg
+++ b/fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.jpeg
diff --git a/fastlane/metadata/android/en_US/images/phoneScreenshots/5_en-US.jpeg b/fastlane/metadata/android/en-US/images/phoneScreenshots/5_en-US.jpeg
index d2ea0637c..d2ea0637c 100644
--- a/fastlane/metadata/android/en_US/images/phoneScreenshots/5_en-US.jpeg
+++ b/fastlane/metadata/android/en-US/images/phoneScreenshots/5_en-US.jpeg
diff --git a/fastlane/metadata/android/en_US/images/sevenInchScreenshots/1_en-US.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1_en-US.png
index 9eb7bda89..9eb7bda89 100644
--- a/fastlane/metadata/android/en_US/images/sevenInchScreenshots/1_en-US.png
+++ b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1_en-US.png
diff --git a/fastlane/metadata/android/en_US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt
index 01629f09c..01629f09c 100644
--- a/fastlane/metadata/android/en_US/short_description.txt
+++ b/fastlane/metadata/android/en-US/short_description.txt
diff --git a/fastlane/metadata/android/en_US/title.txt b/fastlane/metadata/android/en-US/title.txt
index c0fbba6e0..c0fbba6e0 100644
--- a/fastlane/metadata/android/en_US/title.txt
+++ b/fastlane/metadata/android/en-US/title.txt
diff --git a/fastlane/metadata/android/en_US/video.txt b/fastlane/metadata/android/en-US/video.txt
index e69de29bb..e69de29bb 100644
--- a/fastlane/metadata/android/en_US/video.txt
+++ b/fastlane/metadata/android/en-US/video.txt
diff --git a/fastlane/metadata/android/fr_FR/full_description.txt b/fastlane/metadata/android/fr-FR/full_description.txt
index 6ce04465b..6ce04465b 100644
--- a/fastlane/metadata/android/fr_FR/full_description.txt
+++ b/fastlane/metadata/android/fr-FR/full_description.txt
diff --git a/fastlane/metadata/android/fr_FR/short_description.txt b/fastlane/metadata/android/fr-FR/short_description.txt
index 68c88d343..68c88d343 100644
--- a/fastlane/metadata/android/fr_FR/short_description.txt
+++ b/fastlane/metadata/android/fr-FR/short_description.txt
diff --git a/fastlane/metadata/android/fr_FR/title.txt b/fastlane/metadata/android/fr-FR/title.txt
index c0fbba6e0..c0fbba6e0 100644
--- a/fastlane/metadata/android/fr_FR/title.txt
+++ b/fastlane/metadata/android/fr-FR/title.txt
diff --git a/fastlane/metadata/android/fr_FR/video.txt b/fastlane/metadata/android/fr-FR/video.txt
index e69de29bb..e69de29bb 100644
--- a/fastlane/metadata/android/fr_FR/video.txt
+++ b/fastlane/metadata/android/fr-FR/video.txt
diff --git a/fastlane/metadata/android/nl_NL/full_description.txt b/fastlane/metadata/android/nl-NL/full_description.txt
index 992b3b550..992b3b550 100644
--- a/fastlane/metadata/android/nl_NL/full_description.txt
+++ b/fastlane/metadata/android/nl-NL/full_description.txt
diff --git a/fastlane/metadata/android/nl_NL/short_description.txt b/fastlane/metadata/android/nl-NL/short_description.txt
index b91ee980c..b91ee980c 100644
--- a/fastlane/metadata/android/nl_NL/short_description.txt
+++ b/fastlane/metadata/android/nl-NL/short_description.txt
diff --git a/fastlane/metadata/android/nl_NL/title.txt b/fastlane/metadata/android/nl-NL/title.txt
index c0fbba6e0..c0fbba6e0 100644
--- a/fastlane/metadata/android/nl_NL/title.txt
+++ b/fastlane/metadata/android/nl-NL/title.txt
diff --git a/fastlane/metadata/android/nl_NL/video.txt b/fastlane/metadata/android/nl-NL/video.txt
index e69de29bb..e69de29bb 100644
--- a/fastlane/metadata/android/nl_NL/video.txt
+++ b/fastlane/metadata/android/nl-NL/video.txt
diff --git a/fastlane/metadata/android/pl_PL/full_description.txt b/fastlane/metadata/android/pl-PL/full_description.txt
index c1eab69e0..c1eab69e0 100644
--- a/fastlane/metadata/android/pl_PL/full_description.txt
+++ b/fastlane/metadata/android/pl-PL/full_description.txt
diff --git a/fastlane/metadata/android/pl_PL/short_description.txt b/fastlane/metadata/android/pl-PL/short_description.txt
index 043324ca3..043324ca3 100644
--- a/fastlane/metadata/android/pl_PL/short_description.txt
+++ b/fastlane/metadata/android/pl-PL/short_description.txt
diff --git a/fastlane/metadata/android/pl_PL/title.txt b/fastlane/metadata/android/pl-PL/title.txt
index c0fbba6e0..c0fbba6e0 100644
--- a/fastlane/metadata/android/pl_PL/title.txt
+++ b/fastlane/metadata/android/pl-PL/title.txt
diff --git a/fastlane/metadata/android/pl_PL/video.txt b/fastlane/metadata/android/pl-PL/video.txt
index e69de29bb..e69de29bb 100644
--- a/fastlane/metadata/android/pl_PL/video.txt
+++ b/fastlane/metadata/android/pl-PL/video.txt
diff --git a/fastlane/metadata/android/ru_RU/full_description.txt b/fastlane/metadata/android/ru-RU/full_description.txt
index 008118d5f..008118d5f 100644
--- a/fastlane/metadata/android/ru_RU/full_description.txt
+++ b/fastlane/metadata/android/ru-RU/full_description.txt
diff --git a/fastlane/metadata/android/ru_RU/short_description.txt b/fastlane/metadata/android/ru-RU/short_description.txt
index f662bffd1..f662bffd1 100644
--- a/fastlane/metadata/android/ru_RU/short_description.txt
+++ b/fastlane/metadata/android/ru-RU/short_description.txt
diff --git a/fastlane/metadata/android/ru_RU/title.txt b/fastlane/metadata/android/ru-RU/title.txt
index c0fbba6e0..c0fbba6e0 100644
--- a/fastlane/metadata/android/ru_RU/title.txt
+++ b/fastlane/metadata/android/ru-RU/title.txt
diff --git a/fastlane/metadata/android/ru_RU/video.txt b/fastlane/metadata/android/ru-RU/video.txt
index e69de29bb..e69de29bb 100644
--- a/fastlane/metadata/android/ru_RU/video.txt
+++ b/fastlane/metadata/android/ru-RU/video.txt
diff --git a/navit/vehicle/gpsd/vehicle_gpsd.c b/navit/vehicle/gpsd/vehicle_gpsd.c
index da17a6699..9dbc18aa4 100644
--- a/navit/vehicle/gpsd/vehicle_gpsd.c
+++ b/navit/vehicle/gpsd/vehicle_gpsd.c
@@ -238,6 +238,7 @@ static int vehicle_gpsd_try_open(struct vehicle_priv *priv) {
     priv->gps = gps_open(source + 7, port);
     if(!priv->gps) {
 #endif
+        priv->cbt = callback_new_1(callback_cast(vehicle_gpsd_try_open), priv);
         dbg(lvl_error,"gps_open failed for '%s'. Retrying in %d seconds. Have you started gpsd?", priv->source,
             priv->retry_interval);
         g_free(source);
@@ -314,10 +315,11 @@ static void vehicle_gpsd_close(struct vehicle_priv *priv) {
     }
     if (priv->gps) {
         gps_close(priv->gps);
-#if GPSD_API_MAJOR_VERSION >= 5
-        g_free(priv->gps);
-#endif
-        priv->gps = NULL;
+//if we release the gps object a reconnect is no longer working.
+//#if GPSD_API_MAJOR_VERSION >= 5
+//        g_free(priv->gps);
+//#endif
+//        priv->gps = NULL;
     }
 #ifdef HAVE_GPSBT
     err = gpsbt_stop(&priv->context);