Only calculate mutt_fqdn when needed

diff --git a/send.c b/send.c
index b1c07fec88d955cbf29f8e96715cc783379807be..2b01d0c44a081cb919705d9ac09da0c9e12cd0ad 100644 (file)
--- a/send.c
+++ b/send.c
@@ -1069,7 +1069,6 @@ static struct Address *set_reverse_name(struct Envelope *env)
 struct Address *mutt_default_from(void)
 {
   struct Address *addr = NULL;
-  const char *fqdn = mutt_fqdn(true);
 
   /* Note: We let $from override $realname here.
    *       Is this the right thing to do?
@@ -1077,17 +1076,19 @@ struct Address *mutt_default_from(void)
 
   if (From)
     addr = mutt_addr_copy(From);
-  else if (UseDomain)
-  {
-    addr = mutt_addr_new();
-    addr->mailbox =
-        mutt_mem_malloc(mutt_str_strlen(Username) + mutt_str_strlen(fqdn) + 2);
-    sprintf(addr->mailbox, "%s@%s", NONULL(Username), NONULL(fqdn));
-  }
-  else
-  {
+  else {
     addr = mutt_addr_new();
-    addr->mailbox = mutt_str_strdup(NONULL(Username));
+    if (UseDomain)
+    {
+      const char *fqdn = mutt_fqdn(true);
+      addr->mailbox =
+          mutt_mem_malloc(mutt_str_strlen(Username) + mutt_str_strlen(fqdn) + 2);
+      sprintf(addr->mailbox, "%s@%s", NONULL(Username), NONULL(fqdn));
+    }
+    else
+    {
+      addr->mailbox = mutt_str_strdup(NONULL(Username));
+    }
   }
 
   return addr;