backup/planetblupi
1
0
Fork 0
mirror of https://github.com/blupi-games/planetblupi synced 2024-12-30 10:15:36 +01:00
Code Issues Projects Releases Activity

Abort the update curl request when exiting

Browse Source 
It can take one second (max).

- It closes issue #40.
This commit is contained in:
Mathieu Schroeter 2017-11-01 06:55:53 +01:00
parent 67c7c4c970
commit 4b8623f408
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/blupi.cxx
View File

@ -18,6 +18,7 @@
* along with this program. If not, see http://gnu.org/licenses * along with this program. If not, see http://gnu.org/licenses
*/ */
#include <atomic>
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>
#include <iterator> #include <iterator>
@ -53,12 +54,13 @@
SDL_Window * g_window; SDL_Window * g_window;
SDL_Renderer * g_renderer; SDL_Renderer * g_renderer;
CEvent * g_pEvent = nullptr; CEvent * g_pEvent = nullptr;
CPixmap * g_pPixmap = nullptr; // pixmap principal CPixmap * g_pPixmap = nullptr; // pixmap principal
CSound * g_pSound = nullptr; // sound principal CSound * g_pSound = nullptr; // sound principal
CMovie * g_pMovie = nullptr; // movie principal CMovie * g_pMovie = nullptr; // movie principal
CDecor * g_pDecor = nullptr; CDecor * g_pDecor = nullptr;
std::thread * g_updateThread = nullptr; std::thread * g_updateThread = nullptr;
std::atomic<bool> g_updateAbort (false);
bool g_bFullScreen = false; // false si mode de test bool g_bFullScreen = false; // false si mode de test
Uint8 g_windowScale = 1; Uint8 g_windowScale = 1;
@ -482,6 +484,13 @@ updateCallback (void * ptr, size_t size, size_t nmemb, void * data)
return realsize; return realsize;
} }
static int
progressCallback (
void * userData, double dltotal, double dlnow, double ultotal, double ulnow)
{
return g_updateAbort ? 1 : 0;
}
#endif /* USE_CURL */ #endif /* USE_CURL */
static void static void
@ -506,6 +515,11 @@ CheckForUpdates ()
curl_easy_setopt (curl, CURLOPT_URL, "http://blupi.org/update/planet.json"); curl_easy_setopt (curl, CURLOPT_URL, "http://blupi.org/update/planet.json");
curl_easy_setopt (curl, CURLOPT_WRITEDATA, (void *) &chunk); curl_easy_setopt (curl, CURLOPT_WRITEDATA, (void *) &chunk);
curl_easy_setopt (curl, CURLOPT_NOPROGRESS, 0);
curl_easy_setopt (curl, CURLOPT_PROGRESSDATA, nullptr);
curl_easy_setopt (curl, CURLOPT_PROGRESSFUNCTION, progressCallback);
chunk.status = curl_easy_perform (curl); chunk.status = curl_easy_perform (curl);
if (chunk.status) if (chunk.status)
@ -986,6 +1000,7 @@ main (int argc, char * argv[])
if (g_updateThread) if (g_updateThread)
{ {
g_updateAbort = true;
g_updateThread->join (); g_updateThread->join ();
delete (g_updateThread); delete (g_updateThread);
} }