From 4614af4eca8d3191e3c59a04dc91e1b8e3dd9a57 Mon Sep 17 00:00:00 2001
From: Aleksandar Krsteski <alekrsteski@gmail.com>
Date: Thu, 19 Feb 2009 01:16:34 +0100
Subject: [PATCH 1/2] Fixing a bug when zsh is used as default shell.
Zsh exited immediately when empty list was passed as argv argument. This
occurred when using zsh without enabled login_shell option, causing an
infinite loop with tab creation and destroying. To fix this default the
argv to None.
Signed-off-by: Aleksandar Krsteski <alekrsteski@gmail.com>
---
src/guake.py | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/guake.py b/src/guake.py
index 3055bf1..523bd7b 100644
|
a
|
b
|
|
| 869 | 869 | """Return all parameters to be passed to the fork_command |
| 870 | 870 | method of a vte terminal. |
| 871 | 871 | """ |
| 872 | | argv = [] |
| | 872 | argv = None |
| 873 | 873 | shell = self.client.get_string(KEY('/general/default_shell')) or 'sh' |
| 874 | 874 | login_shell = self.client.get_bool(KEY('/general/use_login_shell')) |
| 875 | 875 | if login_shell: |
| 876 | | argv.append('-') |
| | 876 | argv = ['-'] |
| 877 | 877 | |
| 878 | 878 | directory = self.get_current_dir() |
| 879 | | return shell, argv, None, directory, login_shell, None, None |
| | 879 | return shell, argv, None, directory, login_shell, False, False |
| 880 | 880 | |
| 881 | 881 | def add_tab(self, *args): |
| 882 | 882 | """Adds a new tab to the terminal notebook. |
