diff options
| author | George Hazan <george.hazan@gmail.com> | 2024-02-17 18:09:02 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2024-02-17 18:09:02 +0300 |
| commit | 44a4b1bce05a0c8850030877586de85c7efc1b31 (patch) | |
| tree | 78636057c76bdf334748a4d1891bed723667a1a4 /src/mir_app | |
| parent | 9dc65d69d99868d807b3dde1f3e27c7d50710930 (diff) | |
fixes #4203 (Все группы, кроме последней пропадают после стирания groups.json)
Diffstat (limited to 'src/mir_app')
| -rw-r--r-- | src/mir_app/src/clc.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/mir_app/src/clc.cpp b/src/mir_app/src/clc.cpp index 253f787e54..90b8b56232 100644 --- a/src/mir_app/src/clc.cpp +++ b/src/mir_app/src/clc.cpp @@ -354,33 +354,33 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam case INTM_GROUPSCHANGED:
if (auto *pGroup = (CGroupInternal *)lParam) {
// check name of group and ignore message if just being expanded/collapsed
- if (!Clist_FindItem(hwnd, dat, pGroup->groupId+1 | HCONTACT_ISGROUP, &contact, &group))
- break;
+ if (Clist_FindItem(hwnd, dat, pGroup->groupId + 1 | HCONTACT_ISGROUP, &contact, &group)) {
+ CMStringW szFullName(contact->szText);
+ while (group->parent) {
+ ClcContact *cc = nullptr;
+ for (auto &it : group->parent->cl)
+ if (it->group == group) {
+ cc = it;
+ break;
+ }
- CMStringW szFullName(contact->szText);
- while (group->parent) {
- ClcContact *cc = nullptr;
- for (auto &it : group->parent->cl)
- if (it->group == group) {
- cc = it;
+ if (cc == nullptr) {
+ szFullName.Empty();
break;
}
-
- if (cc == nullptr) {
- szFullName.Empty();
- break;
+ szFullName = CMStringW(cc->szText) + L"\\" + szFullName;
+ group = group->parent;
}
- szFullName = CMStringW(cc->szText) + L"\\" + szFullName;
- group = group->parent;
- }
- bool eq = !mir_wstrcmp(szFullName, pGroup->groupName);
- if (eq && contact->group->bHideOffline == ((pGroup->flags & GROUPF_HIDEOFFLINE) != 0))
- break; // only expanded has changed: no action reqd
+ bool eq = !mir_wstrcmp(szFullName, pGroup->groupName);
+ if (eq && contact->group->bHideOffline == ((pGroup->flags & GROUPF_HIDEOFFLINE) != 0))
+ break; // only expanded has changed: no action reqd
- Clist_SaveStateAndRebuildList(hwnd, dat);
+ Clist_SaveStateAndRebuildList(hwnd, dat);
+ break;
+ }
}
- else Clist_InitAutoRebuild(hwnd);
+ Clist_InitAutoRebuild(hwnd);
break;
case INTM_NAMEORDERCHANGED:
|