diff options
Diffstat (limited to 'src/network/network_chat_gui.cpp')
| -rw-r--r-- | src/network/network_chat_gui.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/network/network_chat_gui.cpp b/src/network/network_chat_gui.cpp index 4f4447779..43505cf75 100644 --- a/src/network/network_chat_gui.cpp +++ b/src/network/network_chat_gui.cpp @@ -300,12 +300,14 @@ struct NetworkChatWindow : public QueryStringBaseWindow { /* First, try clients */ if (*item < MAX_CLIENT_SLOTS) { - /* Skip inactive clients */ - NetworkClientInfo *ci; - FOR_ALL_CLIENT_INFOS_FROM(ci, *item + 1) break; - if (ci != NULL) { - *item = ci->index; - return ci->client_name; + if (*item + 1 < GetNetworkClientInfoPoolSize()) { + /* Skip inactive clients */ + NetworkClientInfo *ci; + FOR_ALL_CLIENT_INFOS_FROM(ci, *item + 1) break; + if (ci != NULL) { + *item = ci->index; + return ci->client_name; + } } *item = MAX_CLIENT_SLOTS; } |