summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--src/gui/gui-bar-item.c5
2 files changed, 3 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 7ac113119..69d1c0e60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@ v0.3.6-dev, 2011-09-22
Version 0.3.6 (under dev!)
--------------------------
+* core: fix display of paste multi-line prompt with a root input bar
+ (bug #34305)
* core: add "inactive" colors for inactive windows and lines in merged buffers,
new options: weechat.look.color_inactive_message,
weechat.look.color_inactive_prefix, weechat.look.color_inactive_prefix_buffer,
diff --git a/src/gui/gui-bar-item.c b/src/gui/gui-bar-item.c
index a49eefd73..57b64c531 100644
--- a/src/gui/gui-bar-item.c
+++ b/src/gui/gui-bar-item.c
@@ -594,10 +594,7 @@ gui_bar_item_default_input_paste (void *data, struct t_gui_bar_item *item,
(void) data;
(void) item;
- if (!window)
- return NULL;
-
- if (window != gui_current_window)
+ if (window && (window != gui_current_window))
return NULL;
if (!gui_key_paste_pending)