fixes #2316 (ICQ: если удалить ClistGroups из базы, то контакты при перезапуске пропадут из клиста)

1 files changed, 12 insertions, 14 deletions

diff --git a/protocols/ICQ-WIM/src/poll.cpp b/protocols/ICQ-WIM/src/poll.cpp
index f14e30ba95..f6072bdf0f 100644
--- a/protocols/ICQ-WIM/src/poll.cpp
+++ b/protocols/ICQ-WIM/src/poll.cpp
@@ -52,18 +52,17 @@ void CIcqProto::ProcessBuddyList(const JSONNode &ev)
 
 			setWString(hContact, "IcqGroup", pGroup->wszName);
 
+			if (!bCreated) {
+				Clist_GroupCreate(0, pGroup->wszName);
+				bCreated = true;
+			}
+
 			ptrW mirGroup(Clist_GetGroup(hContact));
 			if (mir_wstrcmp(mirGroup, pGroup->wszName))
 				bEnableMenu = true;
 
-			if (!mirGroup) {
-				if (!bCreated) {
-					Clist_GroupCreate(0, pGroup->wszName);
-					bCreated = true;
-				}
-
+			if (!mirGroup)
 				Clist_SetGroup(hContact, pGroup->wszName);
-			}
 		}
 	}
 
@@ -115,15 +114,14 @@ void CIcqProto::ProcessDiff(const JSONNode &ev)
 
 				setWString(hContact, "IcqGroup", pGroup->wszName);
 
-				ptrW wszGroup(Clist_GetGroup(hContact));
-				if (!wszGroup) {
-					if (!bCreated) {
-						Clist_GroupCreate(0, pGroup->wszName);
-						bCreated = true;
-					}
+				if (!bCreated) {
+					Clist_GroupCreate(0, pGroup->wszName);
+					bCreated = true;
+				}
 
+				ptrW wszGroup(Clist_GetGroup(hContact));
+				if (!wszGroup)
 					Clist_SetGroup(hContact, pGroup->wszName);
-				}
 			}
 
 			if (bDeleted)