Merge pull request #135 from Unabashed-Development/bugfixing

RillJ · web-flow · commit 9887989662ec · 2022-01-15T14:47:20.000+01:00
Fix for crash on issue #129
diff --git a/ViewModel/Helpers/NotificationHelper.cs b/ViewModel/Helpers/NotificationHelper.cs
@@ -190,7 +190,8 @@ private static void ChatNotifications(object state)
                     {
                         foreach (ChatMessage c in unreadChatMessages)
                         {
-                            if (!ViewModelMediators.ChatWindowFocus[c.FromUserId])
+                            bool dictionaryContainsUser = ViewModelMediators.ChatWindowFocus.ContainsKey(c.FromUserId);
+                            if ((dictionaryContainsUser && !ViewModelMediators.ChatWindowFocus[c.FromUserId]) || !dictionaryContainsUser)
                             {
                                 Profile chatProfile = Account.Matches.FirstOrDefault(p => p.UserID == c.FromUserId);
                                 ThrowChatMessageNotification(chatProfile.FirstName,

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,8 @@ private static void ChatNotifications(object state)`
`190`	`190`	`{`
`191`	`191`	`foreach (ChatMessage c in unreadChatMessages)`
`192`	`192`	`{`
`193`		`- if (!ViewModelMediators.ChatWindowFocus[c.FromUserId])`
	`193`	`+ bool dictionaryContainsUser = ViewModelMediators.ChatWindowFocus.ContainsKey(c.FromUserId);`
	`194`	`+ if ((dictionaryContainsUser && !ViewModelMediators.ChatWindowFocus[c.FromUserId]) \|\| !dictionaryContainsUser)`
`194`	`195`	`{`
`195`	`196`	`Profile chatProfile = Account.Matches.FirstOrDefault(p => p.UserID == c.FromUserId);`
`196`	`197`	`ThrowChatMessageNotification(chatProfile.FirstName,`