From: Mantas Mikulėnas <grawity@gmail.com>
Date: Wed, 19 Jun 2024 06:23:03 +0000 (+0300)
Subject: run: move condition inside set_window_title()
X-Git-Tag: v257-rc1~1024^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86295cb60e96b96bd971fa87708330271193094d;p=thirdparty%2Fsystemd.git

run: move condition inside set_window_title()
---

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 8cfef7bfbc7..e29986c2140 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -4563,6 +4563,9 @@ static void set_window_title(PTYForward *f) {
 
         assert(f);
 
+        if (!shall_set_terminal_title())
+                return;
+
         (void) gethostname_strict(&hn);
 
         if (emoji_enabled())
@@ -5562,8 +5565,7 @@ static int run_container(
                         } else if (!isempty(arg_background))
                                 (void) pty_forward_set_background_color(forward, arg_background);
 
-                        if (shall_set_terminal_title())
-                                set_window_title(forward);
+                        set_window_title(forward);
                         break;
 
                 default:
diff --git a/src/run/run.c b/src/run/run.c
index ba7bb2148a1..cb67a45b264 100644
--- a/src/run/run.c
+++ b/src/run/run.c
@@ -1634,8 +1634,12 @@ static int acquire_invocation_id(sd_bus *bus, const char *unit, sd_id128_t *ret)
 
 static void set_window_title(PTYForward *f) {
         _cleanup_free_ char *hn = NULL, *cl = NULL, *dot = NULL;
+
         assert(f);
 
+        if (!shall_set_terminal_title())
+                return;
+
         if (!arg_host)
                 (void) gethostname_strict(&hn);
 
@@ -1848,8 +1852,7 @@ static int start_transient_service(sd_bus *bus) {
                         if (!isempty(arg_background))
                                 (void) pty_forward_set_background_color(c.forward, arg_background);
 
-                        if (shall_set_terminal_title())
-                                set_window_title(c.forward);
+                        set_window_title(c.forward);
                 }
 
                 path = unit_dbus_path_from_name(service);
diff --git a/src/vmspawn/vmspawn.c b/src/vmspawn/vmspawn.c
index 20065455005..9dc1514ba7c 100644
--- a/src/vmspawn/vmspawn.c
+++ b/src/vmspawn/vmspawn.c
@@ -1257,6 +1257,9 @@ static void set_window_title(PTYForward *f) {
 
         assert(f);
 
+        if (!shall_set_terminal_title())
+                return;
+
         (void) gethostname_strict(&hn);
 
         if (emoji_enabled())
@@ -2141,8 +2144,7 @@ static int run_virtual_machine(int kvm_device_fd, int vhost_device_fd) {
                 } else if (!isempty(arg_background))
                         (void) pty_forward_set_background_color(forward, arg_background);
 
-                if (shall_set_terminal_title())
-                        set_window_title(forward);
+                set_window_title(forward);
         }
 
         r = sd_event_loop(event);