Move _curl_sid

diff --git a/src/gps.h b/src/gps.h
index 78693acd9dd2bf577750b5a2fb00bb87494dc204..f30e73f69a6e095f09e420b7ae82e8f95e0bf98b 100644 (file)
--- a/src/gps.h
+++ b/src/gps.h
@@ -44,8 +44,6 @@ guint _input_sid;
 
 /** The Source ID of the "Connect Later" idle. */
 guint _clater_sid;
-/** The Source ID of the CURL Multi Download timeout. */
-guint _curl_sid;
 
 gint _gmtoffset;
 

diff --git a/src/map-download.c b/src/map-download.c
index 9e80eaadc38f02cd0fff4d11b5e85cd384f17d04..a7130211e53680249d7d6cb49abb2cc05ae69435 100644 (file)
--- a/src/map-download.c
+++ b/src/map-download.c
@@ -531,4 +531,8 @@ if (_curl_multi) {
        g_hash_table_destroy(_pui_by_easy);
 }
 
+if (_curl_sid) {
+    g_source_remove(_curl_sid);
+    _curl_sid = 0;
+}  
 }

diff --git a/src/map-download.h b/src/map-download.h
index ab583300d7e55cc81ceb23167e04a9c7bc72d485..3163d1a68df9d10b9c3bc817489002979b44ee08 100644 (file)
--- a/src/map-download.h
+++ b/src/map-download.h
@@ -9,6 +9,9 @@
 
 #define INITIAL_DOWNLOAD_RETRIES (3)
 
+/** The Source ID of the CURL Multi Download timeout. */
+guint _curl_sid;
+
 CURLM *_curl_multi;
 GQueue *_curl_easy_queue;
 GTree *_pui_tree;

diff --git a/src/mapper.c b/src/mapper.c
index c4fcab4e4e7259cf84be53ffac7cddd448366a9e..d6e2177a8eb448832b3591cce15d623d1a5f3445 100644 (file)
--- a/src/mapper.c
+++ b/src/mapper.c
@@ -127,10 +127,6 @@ config_save();
 config_save_repo();
 rcvr_disconnect();
 map_download_deinit();
-if (_curl_sid) {
-       g_source_remove(_curl_sid);
-       _curl_sid = 0;
-}
 #if defined (WITH_GST) && defined (WITH_ESPEAK)
 speak_deinit();
 #endif