From 0d89d32f2e832fdb7ff45a2c24cea42f1d43b59e Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 8 Jul 2013 15:53:17 +0000
Subject: fix for crash in tabSRMM, when Skype passes nickname=NULL inside a
 chat

git-svn-id: http://svn.miranda-ng.org/main/trunk@5281 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 bin11/mir_icons.sln                  | 10 ++++++++++
 plugins/TabSRMM/src/chat/manager.cpp |  4 ++++
 2 files changed, 14 insertions(+)

diff --git a/bin11/mir_icons.sln b/bin11/mir_icons.sln
index 9cf15ee746..a25d3d5f07 100644
--- a/bin11/mir_icons.sln
+++ b/bin11/mir_icons.sln
@@ -70,6 +70,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Skype", "..\protocols
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_conn_Skype", "..\protocols\Skype\proto_conn_skype\Proto_conn_Skype_11.vcxproj", "{A3A599DF-AE0F-DAFC-106D-7E3769E18E6D}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_WhatsApp", "..\protocols\WhatsApp\proto_whatsapp\Proto_WhatsApp_11.vcxproj", "{64A2B403-90AF-4CF8-BC69-4E8D33872D64}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -358,6 +360,14 @@ Global
 		{A3A599DF-AE0F-DAFC-106D-7E3769E18E6D}.Release|Win32.Build.0 = Release|Win32
 		{A3A599DF-AE0F-DAFC-106D-7E3769E18E6D}.Release|x64.ActiveCfg = Release|x64
 		{A3A599DF-AE0F-DAFC-106D-7E3769E18E6D}.Release|x64.Build.0 = Release|x64
+		{64A2B403-90AF-4CF8-BC69-4E8D33872D64}.Debug|Win32.ActiveCfg = Debug|Win32
+		{64A2B403-90AF-4CF8-BC69-4E8D33872D64}.Debug|Win32.Build.0 = Debug|Win32
+		{64A2B403-90AF-4CF8-BC69-4E8D33872D64}.Debug|x64.ActiveCfg = Debug|x64
+		{64A2B403-90AF-4CF8-BC69-4E8D33872D64}.Debug|x64.Build.0 = Debug|x64
+		{64A2B403-90AF-4CF8-BC69-4E8D33872D64}.Release|Win32.ActiveCfg = Release|Win32
+		{64A2B403-90AF-4CF8-BC69-4E8D33872D64}.Release|Win32.Build.0 = Release|Win32
+		{64A2B403-90AF-4CF8-BC69-4E8D33872D64}.Release|x64.ActiveCfg = Release|x64
+		{64A2B403-90AF-4CF8-BC69-4E8D33872D64}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/plugins/TabSRMM/src/chat/manager.cpp b/plugins/TabSRMM/src/chat/manager.cpp
index e5ea48094f..2dec98fe54 100644
--- a/plugins/TabSRMM/src/chat/manager.cpp
+++ b/plugins/TabSRMM/src/chat/manager.cpp
@@ -1011,6 +1011,10 @@ BOOL TM_RemoveAll(STATUSINFO** ppStatusList)
 //MAD: alternative sorting by Nullbie
 static int sttCompareNicknames(const TCHAR *s1, const TCHAR *s2)
 {
+	if (!s1 && !s2) return 0;
+	if (!s1 && s2) return +1;
+	if (s1 && !s2) return -1;
+
 	// skip rubbish
 	while (*s1 && !_istalpha(*s1)) ++s1;
 	while (*s2 && !_istalpha(*s2)) ++s2;
-- 
cgit v1.2.3