epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10409 from Mailaender/fix-globalchat

Browse Source 
Fixed all known crashes in GlobalChat
This commit is contained in:
abcdefg30
2016-01-04 15:42:14 +01:00
parent e4f4c578f6 83bada07b5
commit bb399a536b
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Game/GlobalChat.cs
View File

@@ -225,9 +225,17 @@ namespace OpenRA.Chat
void OnKick(object sender, KickEventArgs e) void OnKick(object sender, KickEventArgs e)
{ {
Disconnect(); if (e.Whom == client.Nickname)
connectionStatus = ChatConnectionStatus.Error; {
AddNotification("Error: You were kicked from the chat by {0}".F(e.Who)); Disconnect();
connectionStatus = ChatConnectionStatus.Error;
AddNotification("You were kicked from the chat by {0}. ({1})".F(e.Who, e.KickReason));
}
else
{
Users.Remove(e.Whom);
AddNotification("{0} was kicked from the chat by {1}. ({2})".F(e.Whom, e.Who, e.KickReason));
}
} }
void OnJoin(object sender, JoinEventArgs e) void OnJoin(object sender, JoinEventArgs e)

3
OpenRA.Mods.Common/Widgets/ScrollPanelWidget.cs
View File

@@ -379,6 +379,9 @@ namespace OpenRA.Mods.Common.Widgets
void BindingAddImpl(object item) void BindingAddImpl(object item)
{ {
if (makeWidget == null)
return;
var widget = makeWidget(item); var widget = makeWidget(item);
var scrollToBottom = autoScroll && ScrolledToBottom; var scrollToBottom = autoScroll && ScrolledToBottom;