Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo

This commit is contained in:
Lyndon
2017-12-08 17:59:11 +01:00
79 changed files with 7005 additions and 925 deletions

View File

@@ -28,6 +28,7 @@ namespace BeWo
var lc = new LoginControl();
rootGrid.Children.Add(lc);
lc.LoginSuccessful += lc_LoginSuccessful;
}
void lc_LoginSuccessful(object sender, EventArgs e)
@@ -84,7 +85,7 @@ namespace BeWo
BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl.newThread != null)
{
BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl.newThread = null;
BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl.threadBool = false;
BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl.disableKontaktNachrichtenThread = true;
}
if (BeWoApp.MainControl.HomeView.ServiceChatView.ServiceChat._emojiView != null) {