Changeset - r5672:9642b28d8d67
[Not reviewed]
master
0 1 0
Darkvater - 17 years ago 2007-01-14 21:32:13
darkvater@openttd.org
(svn r8132) -Fix (r6824): The game could crash when the chat key (<ENTER>) is pressed too vehemently during the join of the game. Your client's id does not exist in the clients list yet, and returns NULL.
1 file changed with 6 insertions and 2 deletions:
0 comments (0 inline, 0 general)
src/main_gui.cpp
Show inline comments
 
@@ -2302,6 +2302,8 @@ static void MainWindowWndProc(Window *w,
 
					const NetworkClientInfo *cio = NetworkFindClientInfoFromIndex(_network_own_client_index);
 
					bool teamchat = false;
 

	
 
					if (cio == NULL) break;
 

	
 
					/* Only players actually playing can speak to team. Eg spectators cannot */
 
					if (_patches.prefer_teamchat && IsValidPlayer(cio->client_playas)) {
 
						const NetworkClientInfo *ci;
 
@@ -2323,8 +2325,10 @@ static void MainWindowWndProc(Window *w,
 

	
 
			case WKC_CTRL | WKC_RETURN: case WKC_CTRL | 'T': // send text to all team mates
 
				if (_networking) {
 
					const NetworkClientInfo *ci = NetworkFindClientInfoFromIndex(_network_own_client_index);
 
					ShowNetworkChatQueryWindow(DESTTYPE_TEAM, ci->client_playas);
 
					const NetworkClientInfo *cio = NetworkFindClientInfoFromIndex(_network_own_client_index);
 
					if (cio == NULL) break;
 

	
 
					ShowNetworkChatQueryWindow(DESTTYPE_TEAM, cio->client_playas);
 
				}
 
				break;
 
#endif
0 comments (0 inline, 0 general)