From 69d5692529f587ecc08dc89bcf50043859080d85 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 22 Dec 2018 14:12:53 -0500 Subject: [PATCH] system-helper: Don't pass NULL for progress When calling into FlatpakDir apis that take an OstreeProgress, always pass a no-op instance, never NULL. Closes: #2468 Approved by: alexlarsson --- system-helper/flatpak-system-helper.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/system-helper/flatpak-system-helper.c b/system-helper/flatpak-system-helper.c index fbb47dec..2292ae2f 100644 --- a/system-helper/flatpak-system-helper.c +++ b/system-helper/flatpak-system-helper.c @@ -567,22 +567,25 @@ handle_deploy_appstream (FlatpakSystemHelper *object, g_autoptr(GError) first_error = NULL; g_autoptr(GError) second_error = NULL; g_autoptr(GMainContextPopDefault) main_context = NULL; + g_autoptr(OstreeAsyncProgress) ostree_progress = NULL; /* Work around ostree-pull spinning the default main context for the sync calls */ main_context = flatpak_main_context_new_default (); + ostree_progress = ostree_async_progress_new_and_connect (no_progress_cb, NULL); + if (!flatpak_dir_pull_untrusted_local (system, arg_repo_path, arg_origin, new_branch, NULL, - NULL, + ostree_progress, NULL, &first_error)) { if (!flatpak_dir_pull_untrusted_local (system, arg_repo_path, arg_origin, old_branch, NULL, - NULL, + ostree_progress, NULL, &second_error)) { g_prefix_error (&first_error, "Error updating appstream2: ");