summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-05-07 17:08:41 +0000
committerrubidium <rubidium@openttd.org>2009-05-07 17:08:41 +0000
commit101af1f9b52176272071b74bcb5045d94951794a (patch)
treebd9caddf7f075dffdf4aa52335faa81986eedb70
parent73e1d188710f2745d27505da34e2f68e3f63f551 (diff)
downloadopenttd-101af1f9b52176272071b74bcb5045d94951794a.tar.xz
(svn r16250) -Fix (r16242): do not try to unpause when paused for a joining company
-rw-r--r--src/network/network.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/network.cpp b/src/network/network.cpp
index dc025dad1..a98ff2f12 100644
--- a/src/network/network.cpp
+++ b/src/network/network.cpp
@@ -356,7 +356,7 @@ static void CheckMinActiveClients()
DoCommandP(0, PM_PAUSED_NORMAL, 1, CMD_PAUSE);
NetworkServerSendChat(NETWORK_ACTION_SERVER_MESSAGE, DESTTYPE_BROADCAST, 0, "", CLIENT_ID_SERVER, NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS);
} else {
- if (_pause_mode == PM_UNPAUSED) return;
+ if ((_pause_mode & PM_PAUSED_NORMAL) == 0) return;
DoCommandP(0, PM_PAUSED_NORMAL, 0, CMD_PAUSE);
NetworkServerSendChat(NETWORK_ACTION_SERVER_MESSAGE, DESTTYPE_BROADCAST, 0, "", CLIENT_ID_SERVER, NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS);