diff options
Diffstat (limited to 'src/core/commands.c')
-rw-r--r-- | src/core/commands.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/core/commands.c b/src/core/commands.c index 96a74008..91e4a170 100644 --- a/src/core/commands.c +++ b/src/core/commands.c @@ -653,11 +653,12 @@ typedef struct { GHashTable *options; } CMD_TEMP_REC; -static char *get_optional_channel(WI_ITEM_REC *active_item, char **data, - int require_name) +static const char * +get_optional_channel(WI_ITEM_REC *active_item, char **data, int require_name) { CHANNEL_REC *chanrec; - char *tmp, *origtmp, *channel, *ret; + const char *ret; + char *tmp, *origtmp, *channel; if (active_item == NULL) { /* no active channel in window, channel required */ @@ -670,10 +671,10 @@ static char *get_optional_channel(WI_ITEM_REC *active_item, char **data, if (strcmp(channel, "*") == 0 && !require_name) { /* "*" means active channel */ cmd_get_param(data); - ret = active_item->name; + ret = window_item_get_target(active_item); } else if (!server_ischannel(active_item->server, channel)) { /* we don't have channel parameter - use active channel */ - ret = active_item->name; + ret = window_item_get_target(active_item); } else { /* Find the channel first and use it's name if found. This allows automatic !channel -> !XXXXXchannel replaces. */ @@ -730,7 +731,7 @@ int cmd_get_params(const char *data, gpointer *free_me, int count, ...) /* optional channel as first parameter */ require_name = (count & PARAM_FLAG_OPTCHAN_NAME) == PARAM_FLAG_OPTCHAN_NAME; - arg = get_optional_channel(item, &datad, require_name); + arg = (char *) get_optional_channel(item, &datad, require_name); str = (char **) va_arg(args, char **); if (str != NULL) *str = arg; |