From a53a8a9faf4529ee90ccbc73acf8d46c2701d9ba Mon Sep 17 00:00:00 2001 From: troy Date: Sat, 30 May 1998 23:56:28 +0000 Subject: [PATCH] Fixed an assert git-svn-id: svn://10.0.0.236/trunk@2772 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/base/src/nsSpaceManager.cpp | 3 +-- mozilla/layout/generic/nsSpaceManager.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/mozilla/layout/base/src/nsSpaceManager.cpp b/mozilla/layout/base/src/nsSpaceManager.cpp index 7d1bb47b367..0ef29a7a04f 100644 --- a/mozilla/layout/base/src/nsSpaceManager.cpp +++ b/mozilla/layout/base/src/nsSpaceManager.cpp @@ -852,9 +852,8 @@ PRBool nsSpaceManager::RemoveRegion(nsIFrame* aFrame) if (nsnull != band) { // If we found a rect occupied by aFrame in this band or the previous band // then try to join the two bands - if (prevFoundMatchingRect || (foundMatchingRect && (nsnull != prevBand))) { + if ((nsnull != prevBand) && (foundMatchingRect || prevFoundMatchingRect)) { // Try and join this band with the previous band - NS_ASSERTION(nsnull != prevBand, "no previous band"); JoinBands(band, prevBand); } } diff --git a/mozilla/layout/generic/nsSpaceManager.cpp b/mozilla/layout/generic/nsSpaceManager.cpp index 7d1bb47b367..0ef29a7a04f 100644 --- a/mozilla/layout/generic/nsSpaceManager.cpp +++ b/mozilla/layout/generic/nsSpaceManager.cpp @@ -852,9 +852,8 @@ PRBool nsSpaceManager::RemoveRegion(nsIFrame* aFrame) if (nsnull != band) { // If we found a rect occupied by aFrame in this band or the previous band // then try to join the two bands - if (prevFoundMatchingRect || (foundMatchingRect && (nsnull != prevBand))) { + if ((nsnull != prevBand) && (foundMatchingRect || prevFoundMatchingRect)) { // Try and join this band with the previous band - NS_ASSERTION(nsnull != prevBand, "no previous band"); JoinBands(band, prevBand); } }