summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gui/gui-buffer.c19
1 files changed, 6 insertions, 13 deletions
diff --git a/src/gui/gui-buffer.c b/src/gui/gui-buffer.c
index 269999119..daa461ac0 100644
--- a/src/gui/gui-buffer.c
+++ b/src/gui/gui-buffer.c
@@ -1492,7 +1492,6 @@ gui_buffer_set (struct t_gui_buffer *buffer, const char *property,
{
long number;
char *error;
- int auto_switch;
if (!property || !value)
return;
@@ -1528,19 +1527,13 @@ gui_buffer_set (struct t_gui_buffer *buffer, const char *property,
else if (string_strcasecmp (property, "display") == 0)
{
/*
- * on "automatic" switch:
- * - check if the buffer displayed in window is the buffer in layout:
- * if yes, do NOT switch to buffer
- * - do NOT set the read marker
+ * if it is auto-switch to a buffer, then we don't set read marker,
+ * otherwise we reset it (if current buffer is not displayed) after
+ * switch
*/
- auto_switch = (string_strcasecmp (value, "auto") == 0);
- if (!auto_switch
- || (gui_layout_window_check_buffer (gui_current_window) != 1))
- {
- gui_window_switch_to_buffer (gui_current_window,
- buffer,
- (auto_switch) ? 0 : 1);
- }
+ gui_window_switch_to_buffer (gui_current_window, buffer,
+ (string_strcasecmp (value, "auto") == 0) ?
+ 0 : 1);
}
else if (string_strcasecmp (property, "print_hooks_enabled") == 0)
{