From 90c2d2412741f80bcd243c0526af785f005d1a7f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 1 Dec 2019 09:39:46 -0500 Subject: [PATCH] ps: Don't hardcode instance column We were unconditionally adding the instance column, which causes table headers to be off-by-one when instance is not among the requested columns. Change things to only add the instance column when requested. --- app/flatpak-builtins-ps.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/flatpak-builtins-ps.c b/app/flatpak-builtins-ps.c index 0e029638..f8313134 100644 --- a/app/flatpak-builtins-ps.c +++ b/app/flatpak-builtins-ps.c @@ -81,11 +81,11 @@ enumerate_instances (Column *columns, GError **error) { FlatpakInstance *instance = (FlatpakInstance *) g_ptr_array_index (instances, j); - flatpak_table_printer_add_column (printer, flatpak_instance_get_id (instance)); - for (i = 0; columns[i].name; i++) { - if (strcmp (columns[i].name, "pid") == 0) + if (strcmp (columns[i].name, "instance") == 0) + flatpak_table_printer_add_column (printer, flatpak_instance_get_id (instance)); + else if (strcmp (columns[i].name, "pid") == 0) { g_autofree char *pid = g_strdup_printf ("%d", flatpak_instance_get_pid (instance)); flatpak_table_printer_add_column (printer, pid);