From 013fe0ad9aa5019d13faa5aae05031eeec5b41ea Mon Sep 17 00:00:00 2001 From: Marius Meisenzahl Date: Tue, 6 Jun 2023 11:29:11 +0200 Subject: [PATCH 1/2] FlatpakBackend: Add null check for user_installation --- src/Core/FlatpakBackend.vala | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/Core/FlatpakBackend.vala b/src/Core/FlatpakBackend.vala index c5b1e135e..681c99666 100644 --- a/src/Core/FlatpakBackend.vala +++ b/src/Core/FlatpakBackend.vala @@ -286,15 +286,17 @@ public class AppCenterCore.FlatpakBackend : Backend, Object { } GLib.GenericArray installed_refs; - try { - installed_refs = user_installation.list_installed_refs (); - installed_apps.add_all (get_installed_apps_from_refs (false, installed_refs, cancellable)); - } catch (Error e) { - critical ("Unable to get installed flatpaks: %s", e.message); - job.result = Value (typeof (Object)); - job.result.take_object ((owned) installed_apps); - job.results_ready (); - return; + if (user_installation != null) { + try { + installed_refs = user_installation.list_installed_refs (); + installed_apps.add_all (get_installed_apps_from_refs (false, installed_refs, cancellable)); + } catch (Error e) { + critical ("Unable to get installed flatpaks: %s", e.message); + job.result = Value (typeof (Object)); + job.result.take_object ((owned) installed_apps); + job.results_ready (); + return; + } } try { From 4e5123c697e76dfcfd506882de65492d9b00a44b Mon Sep 17 00:00:00 2001 From: Marius Meisenzahl Date: Tue, 6 Jun 2023 11:29:44 +0200 Subject: [PATCH 2/2] FlatpakBackend: Add null check for system_installation --- src/Core/FlatpakBackend.vala | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/Core/FlatpakBackend.vala b/src/Core/FlatpakBackend.vala index 681c99666..6f9600781 100644 --- a/src/Core/FlatpakBackend.vala +++ b/src/Core/FlatpakBackend.vala @@ -299,15 +299,17 @@ public class AppCenterCore.FlatpakBackend : Backend, Object { } } - try { - installed_refs = system_installation.list_installed_refs (); - installed_apps.add_all (get_installed_apps_from_refs (true, installed_refs, cancellable)); - } catch (Error e) { - critical ("Unable to get installed flatpaks: %s", e.message); - job.result = Value (typeof (Object)); - job.result.take_object ((owned) installed_apps); - job.results_ready (); - return; + if (system_installation != null) { + try { + installed_refs = system_installation.list_installed_refs (); + installed_apps.add_all (get_installed_apps_from_refs (true, installed_refs, cancellable)); + } catch (Error e) { + critical ("Unable to get installed flatpaks: %s", e.message); + job.result = Value (typeof (Object)); + job.result.take_object ((owned) installed_apps); + job.results_ready (); + return; + } } job.result = Value (typeof (Object));