mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-03-13 12:41:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix downloading extra data when run from a different thread

Browse Source 
The main loop that is initiated while the extra data is being downloaded
needs a different context to be the thread-default one, otherwise the
operations just hang when running from a different thread.
This commit is contained in:
Joaquim Rocha
2017-01-05 14:38:32 +01:00
committed by Alexander Larsson
parent d09f5ea072
commit 5dd952e68e
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/flatpak-utils.c
View File

@@ -4579,6 +4579,7 @@ flatpak_load_http_uri (SoupSession *soup_session,
GError **error)
{
GBytes *bytes = NULL;
g_autoptr(GMainContext) context = NULL;
g_autoptr(SoupRequestHTTP) request = NULL;
g_autoptr(GMainLoop) loop = NULL;
g_autoptr(GString) content = g_string_new ("");
@@ -4586,7 +4587,10 @@ flatpak_load_http_uri (SoupSession *soup_session,
g_debug ("Loading %s using libsoup", uri);
loop = g_main_loop_new (NULL, TRUE);
context = g_main_context_new ();
g_main_context_push_thread_default (context);
loop = g_main_loop_new (context, TRUE);
data.loop = loop;
data.content = content;
data.progress = progress;
@@ -4603,6 +4607,7 @@ flatpak_load_http_uri (SoupSession *soup_session,
load_uri_callback, &data);
g_main_loop_run (loop);
g_main_context_pop_thread_default (context);
if (data.error)
{
@@ -4627,11 +4632,15 @@ flatpak_download_http_uri (SoupSession *soup_session,
{
g_autoptr(SoupRequestHTTP) request = NULL;
g_autoptr(GMainLoop) loop = NULL;
g_autoptr(GMainContext) context = NULL;
LoadUriData data = { NULL };
g_debug ("Loading %s using libsoup", uri);
loop = g_main_loop_new (NULL, TRUE);
context = g_main_context_new ();
g_main_context_push_thread_default (context);
loop = g_main_loop_new (context, TRUE);
data.loop = loop;
data.out = out;
data.progress = progress;
@@ -4648,6 +4657,7 @@ flatpak_download_http_uri (SoupSession *soup_session,
load_uri_callback, &data);
g_main_loop_run (loop);
g_main_context_pop_thread_default (context);
if (data.error)
{