From 924e1a992d88c3f0f2a7cc25b83a8b94c58329b6 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 11 Feb 2025 17:18:41 +0300
Subject: Skype: fix for occasional crash

---
 plugins/Scriver/src/msglog.cpp             | 2 +-
 protocols/SkypeWeb/src/skype_chatrooms.cpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/Scriver/src/msglog.cpp b/plugins/Scriver/src/msglog.cpp
index f3729e9629..16b9533dd5 100644
--- a/plugins/Scriver/src/msglog.cpp
+++ b/plugins/Scriver/src/msglog.cpp
@@ -44,7 +44,7 @@ bool DbEventIsShown(const DB::EventInfo &dbei)
 	switch (dbei.eventType) {
 	case EVENTTYPE_JABBER_CHATSTATES:
 	case EVENTTYPE_JABBER_PRESENCE:
-		return 0;
+		return false;
 	}
 
 	return dbei.isSrmm();
diff --git a/protocols/SkypeWeb/src/skype_chatrooms.cpp b/protocols/SkypeWeb/src/skype_chatrooms.cpp
index 0076bfa9b1..dc8cf49007 100644
--- a/protocols/SkypeWeb/src/skype_chatrooms.cpp
+++ b/protocols/SkypeWeb/src/skype_chatrooms.cpp
@@ -369,7 +369,8 @@ void CSkypeProto::OnGetChatMembers(MHttpResponse *response, AsyncHttpRequest *pR
 		}
 	}
 
-	g_chatApi.OnChangeNick(si);
+	if (g_chatApi.OnChangeNick)
+		g_chatApi.OnChangeNick(si);
 }
 
 void CSkypeProto::OnGetChatInfo(MHttpResponse *response, AsyncHttpRequest*)
-- 
cgit v1.2.3