summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorEmanuele Giaquinta <exg@irssi.org>2006-09-22 16:05:55 +0000
committerexg <exg@dbcabf3a-b0e7-0310-adc4-f8d773084564>2006-09-22 16:05:55 +0000
commit9070ecdcf778fe141f9eb2c141401ccfd8aee05b (patch)
tree4399c61605222734bae88be20af884f2c1bfc597 /src/core
parentce7dc49d9f26597c757de43ea96f57629b2d3c48 (diff)
downloadirssi-9070ecdcf778fe141f9eb2c141401ccfd8aee05b.zip
Revert second hunk of the previous patch, we want to check existence and
execute permission for irssi_binary when upgrading. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4379 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/core')
-rw-r--r--src/core/session.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/session.c b/src/core/session.c
index 8934a61a..f3553634 100644
--- a/src/core/session.c
+++ b/src/core/session.c
@@ -110,11 +110,9 @@ static void cmd_upgrade(const char *data)
char *binary;
if (*data == '\0')
- binary = g_strdup(irssi_binary);
- else
- binary = g_find_program_in_path(data);
+ data = irssi_binary;
- if (binary == NULL)
+ if ((binary = g_find_program_in_path(data)) == NULL)
cmd_return_error(CMDERR_PROGRAM_NOT_FOUND);
/* save the session */