From 7c6755b62cf35deac7a98e30d91765fad3ca2d7f Mon Sep 17 00:00:00 2001
From: Kristofer M White <me@kmwhite.net>
Date: Wed, 5 Mar 2014 19:55:02 +0000
Subject: Ensuring nick is set when not included in opt args for cmd_join

---
 src/command/commands.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/command/commands.c')

diff --git a/src/command/commands.c b/src/command/commands.c
index d6e33a29..9f4882fa 100644
--- a/src/command/commands.c
+++ b/src/command/commands.c
@@ -1643,9 +1643,10 @@ cmd_join(gchar **args, struct cmd_help_t help)
                 }
             }
         }
+    }
 
-    // otherwise use account preference
-    } else {
+    // In the case that a nick wasn't provided by the optional args...
+    if (nick == NULL) {
         nick = account->muc_nick;
     }
 
-- 
cgit 1.4.1-2-gfad0