From 1cbfd712a34661f622471ea79385d4edb141976c Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Sun, 2 Jan 2011 00:19:36 +0000 Subject: [PATCH] Fix #7017 and hopefully #7001. WindowArea is not valid any more when splitting a group. Fix debug assert. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40058 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/decorators/SATDecorator/SATGroup.cpp | 6 +----- src/add-ons/decorators/SATDecorator/StackAndTile.cpp | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/add-ons/decorators/SATDecorator/SATGroup.cpp b/src/add-ons/decorators/SATDecorator/SATGroup.cpp index be855bdf17..3befb3ec4a 100644 --- a/src/add-ons/decorators/SATDecorator/SATGroup.cpp +++ b/src/add-ons/decorators/SATDecorator/SATGroup.cpp @@ -994,12 +994,8 @@ SATGroup::_SplitGroupIfNecessary(WindowArea* removedArea) bool ownGroupProcessed = false; WindowAreaList newGroup; while (_FindConnectedGroup(neighbourWindows, removedArea, newGroup)) { - STRACE_SAT("Connected group found; %i windows:\n", + STRACE_SAT("Connected group found; %i window(s)\n", (int)newGroup.CountItems()); - for (int i = 0; i < newGroup.CountItems(); i++) { - STRACE_SAT("\t%s\n", newGroup.ItemAt(i)->WindowList().ItemAt(0) - ->GetWindow()->Title()); - } if (newGroup.CountItems() == 1 && newGroup.ItemAt(0)->WindowList().CountItems() == 1) { diff --git a/src/add-ons/decorators/SATDecorator/StackAndTile.cpp b/src/add-ons/decorators/SATDecorator/StackAndTile.cpp index d1d72288dd..39ced5f81e 100644 --- a/src/add-ons/decorators/SATDecorator/StackAndTile.cpp +++ b/src/add-ons/decorators/SATDecorator/StackAndTile.cpp @@ -92,7 +92,7 @@ StackAndTile::WindowAdded(Window* window) if (!satWindow) return; - ASSERT(fSATWindowMap.find(window) == fSATWindowMap.end()); + ASSERT(fSATWindowMap.find(window) != fSATWindowMap.end()); fSATWindowMap[window] = satWindow; }