1 files changed, 6 insertions, 2 deletions

diff --git a/xW/xW.cpp b/xW/xW.cpp
index 6984892..980f825 100644
--- a/xW/xW.cpp
+++ b/xW/xW.cpp
@@ -914,11 +914,15 @@ relay_process_message(const Relay::EventMessage &m)
 		if (!b)
 			break;
 
-		b->buffer_name = data.buffer_name;
+		b->buffer_name = data.new_;
 
 		refresh_buffer_list();
-		if (b->buffer_name == g.buffer_current)
+		if (data.buffer_name == g.buffer_current) {
+			g.buffer_current = data.new_;
 			refresh_status();
+		}
+		if (data.buffer_name == g.buffer_last)
+			g.buffer_last = data.new_;
 		break;
 	}
 	case Relay::Event::BUFFER_REMOVE: