From 77fa68c1da6f870137d686200d3962f91e3915d9 Mon Sep 17 00:00:00 2001
From: frosch <frosch@openttd.org>
Date: Sun, 20 Feb 2011 21:00:24 +0000
Subject: (svn r22123) -Fix [FS#4522]: CommandQueue::Pop() did not update
 'last'; popping the last item caused the queue to disconnect unless there was
 only one item.

---
 src/network/network_command.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/network')

diff --git a/src/network/network_command.cpp b/src/network/network_command.cpp
index 8e1fa077b..d68021205 100644
--- a/src/network/network_command.cpp
+++ b/src/network/network_command.cpp
@@ -81,13 +81,16 @@ CommandPacket *CommandQueue::Pop(bool ignore_paused)
 {
 	CommandPacket **prev = &this->first;
 	CommandPacket *ret = this->first;
+	CommandPacket *prev_item = NULL;
 	if (ignore_paused && _pause_mode != PM_UNPAUSED) {
 		while (ret != NULL && !IsCommandAllowedWhilePaused(ret->cmd)) {
+			prev_item = ret;
 			prev = &ret->next;
 			ret = ret->next;
 		}
 	}
 	if (ret != NULL) {
+		if (ret == this->last) this->last = prev_item;
 		*prev = ret->next;
 		this->count--;
 	}
-- 
cgit v1.2.3-70-g09d2