Move curl_global_init() to dcpomatic_setup() and remove curl_global_cleanup.

diff --git a/src/lib/update.cc b/src/lib/update.cc
index 24cd28b167bde800aeb419be236ea85d69036da7..7a3f0bd5ddec3ae4dd6e72a390b185e38f628af0 100644 (file)
--- a/src/lib/update.cc
+++ b/src/lib/update.cc
@@ -57,7 +57,6 @@ UpdateChecker::UpdateChecker ()
        , _emits (0)
        , _to_do (0)
 {
-       curl_global_init (CURL_GLOBAL_ALL);
        _curl = curl_easy_init ();
 
        curl_easy_setopt (_curl, CURLOPT_URL, "http://dcpomatic.com/update");
@@ -76,7 +75,6 @@ UpdateChecker::~UpdateChecker ()
        /* We are not cleaning up our thread, but hey well */
 
        curl_easy_cleanup (_curl);
-       curl_global_cleanup ();
        delete[] _buffer;
 }
 

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 3837aacc7ba0ace7314c30758bfb24be1d710626..dad094b6ee750e76d6697dd7663f865572f1b0d3 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -40,6 +40,7 @@
 #include <dcp/picture_asset.h>
 #include <dcp/sound_asset.h>
 #include <dcp/subtitle_asset.h>
+#include <curl/curl.h>
 #include <glib.h>
 #include <pangomm/init.h>
 #include <boost/algorithm/string.hpp>
@@ -332,6 +333,8 @@ dcpomatic_setup ()
        CinemaSoundProcessor::setup_cinema_sound_processors ();
        AudioProcessor::setup_audio_processors ();
 
+       curl_global_init (CURL_GLOBAL_ALL);
+
        ui_thread = boost::this_thread::get_id ();
 }