From af11439bd5b95d287e5b86c87ceb23adf1374d48 Mon Sep 17 00:00:00 2001
From: kohlerm <markus.kohler@gmail.com>
Date: Fri, 31 Mar 2017 13:47:07 +0000
Subject: [PATCH] improving shell detection

---
 termite.cc | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/termite.cc b/termite.cc
index c8ca152..c12ac10 100644
--- a/termite.cc
+++ b/termite.cc
@@ -1480,11 +1480,17 @@ static void exit_with_success(VteTerminal *) {
 }
 
 static char *get_user_shell_with_fallback() {
-    if (const char *env = g_getenv("SHELL"))
-        return g_strdup(env);
+    if (const char *env = g_getenv("SHELL") )
+    {
+        if (!((env != NULL) && (env[0] == '\0')))
+            return g_strdup(env);
+    }
 
     if (char *command = vte_get_user_shell())
-        return command;
+    {
+        if (!((command != NULL) && (command[0] == '\0')))
+           return command;
+    }
 
     return g_strdup("/bin/sh");
 }