diff --git a/ChangeLog b/ChangeLog
index da41acf48..8e5c58f78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.4-dev, 2010-10-02
+v0.3.4-dev, 2010-10-06
 
 
 Version 0.3.4 (under dev!)
@@ -14,8 +14,6 @@ Version 0.3.4 (under dev!)
   highlight words in buffer
 * core: use similar behaviour for keys bound to local or global history
   (bug #30759)
-* core: fix signal "buffer_switch" (was sent twice when switching buffer)
-  (bug #31158)
 * api: add priority for hooks (task #10550)
 * api: add new functions: hashtable_get_string, hook_info_hashtable,
   info_get_hashtable
diff --git a/src/gui/curses/gui-curses-window.c b/src/gui/curses/gui-curses-window.c
index cbc0a5378..865d1c488 100644
--- a/src/gui/curses/gui-curses-window.c
+++ b/src/gui/curses/gui-curses-window.c
@@ -577,12 +577,9 @@ gui_window_switch_to_buffer (struct t_gui_window *window,
     }
     
     gui_input_move_to_buffer (old_buffer, window->buffer);
-
-    if (old_buffer != window->buffer)
-    {
-        hook_signal_send ("buffer_switch",
-                          WEECHAT_HOOK_SIGNAL_POINTER, buffer);
-    }
+    
+    hook_signal_send ("buffer_switch",
+                      WEECHAT_HOOK_SIGNAL_POINTER, buffer);
 }
 
 /*