⛏️ index : haiku.git

author Máximo Castañeda <antiswen@yahoo.es> 2025-12-09 21:16:26.0 +01:00:00
committer Máximo Castañeda <antiswen@yahoo.es> 2025-12-10 19:26:26.0 +00:00:00
commit
cb5125b47c9613fd7ba493145eee667d07ab9b84 [patch]
tree
08bce7f0758049efc62a4db02ae580db44f82406
parent
bf45aee2752a7997aa977e711685d435eef2b89e
download
cb5125b47c9613fd7ba493145eee667d07ab9b84.tar.gz

Deskbar: fix loop exit when adding a team

We want to check all apps until we find the one we are looking for, not
just the first.

Error introduced in fb885767b6f46f38a0a522c0394550b814227627.

Fixes: #19152
Change-Id: I8b7c5a7c2fcd530b13c70f7a1addda583e30ecdc
Reviewed-on: https://review.haiku-os.org/c/haiku/+/10076
Reviewed-by: Máximo Castañeda <antiswen@yahoo.es>
(cherry picked from commit c33f1b8ccd8e288b6881d6a43910ce38f265af42)
Reviewed-on: https://review.haiku-os.org/c/haiku/+/10083
Reviewed-by: Adrien Destugues <pulkomandy@pulkomandy.tk>

Diff

 src/apps/deskbar/Switcher.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/apps/deskbar/Switcher.cpp b/src/apps/deskbar/Switcher.cpp
index 11d7e6b..1cdea7a 100644
--- a/src/apps/deskbar/Switcher.cpp
+++ b/src/apps/deskbar/Switcher.cpp
@@ -540,12 +540,13 @@
			for (int32 index = 0; index < teamCount; index++) {
				TTeamGroup* group = (TTeamGroup*)fGroupList.ItemAt(index);
				ASSERT(group);
				if (strcasecmp(group->Signature(), signature) == 0
					&& !group->TeamList()->HasItem((void*)(addr_t)team)) {
					group->CacheTeamIcons(fSmallIconSize, fLargeIconSize);
					group->TeamList()->AddItem((void*)(addr_t)team);
				if (strcasecmp(group->Signature(), signature) == 0) {
					if (!group->TeamList()->HasItem((void*)(addr_t)team)) {
						group->CacheTeamIcons(fSmallIconSize, fLargeIconSize);
						group->TeamList()->AddItem((void*)(addr_t)team);
					}
					break;
				}
				break;
			}
			break;
		}