From 1bbf3b889e0b5a3a5af7d21e25b2af185c32cf94 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.ath.cx>
Date: Fri, 2 Jul 2010 17:42:59 +0000
Subject: [PATCH] Patch by Alex Wilson as part of GSoC 2010 : fix a crashing
 bug in BTwoDimensionalLayout::AlignWith() (ticket #6244).

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37348 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/kits/interface/TwoDimensionalLayout.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/kits/interface/TwoDimensionalLayout.cpp b/src/kits/interface/TwoDimensionalLayout.cpp
index 513efb9c0e..5a6387c547 100644
--- a/src/kits/interface/TwoDimensionalLayout.cpp
+++ b/src/kits/interface/TwoDimensionalLayout.cpp
@@ -539,7 +539,7 @@ BTwoDimensionalLayout::CompoundLayouter::AbsorbCompoundLayouter(
 		return;
 
 	int32 count = other->fLocalLayouters.CountItems();
-	for (int32 i = 0; i < count; i++) {
+	for (int32 i = count - 1; i >= 0; i--) {
 		LocalLayouter* layouter
 			= (LocalLayouter*)other->fLocalLayouters.ItemAt(i);
 		AddLocalLayouter(layouter);
@@ -1169,7 +1169,7 @@ BTwoDimensionalLayout::LocalLayouter::SetCompoundLayouter(
 		fHLayouter = compoundLayouter;
 	} else {
 		oldCompoundLayouter = fVLayouter;
-		fVLayouter = (VerticalCompoundLayouter*)compoundLayouter;
+		fVLayouter = static_cast<VerticalCompoundLayouter*>(compoundLayouter);
 	}
 
 	if (compoundLayouter == oldCompoundLayouter)