From 9c5644aa0913c5af2926f43353122d580e28bf79 Mon Sep 17 00:00:00 2001
From: John Scipione <jscipione@gmail.com>
Date: Wed, 25 Jul 2012 12:48:14 -0400
Subject: [PATCH] Detach the scrollbars before deleting fExpando. ... when
 rebuilding the application bar.

This fixes a Deskbar crash on resolution change because the lower
scrollbar is a child of fExpando so it must be removed and deleted
before fExpando is. So the tear down is remote scroll arrows
(if attached) then remote fExpando, then remove the scroll arrow
container view. The application bar is then rebuilt in reverse.
---
 src/apps/deskbar/BarView.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/apps/deskbar/BarView.cpp b/src/apps/deskbar/BarView.cpp
index 77b7a21c9e..e08d6d8114 100644
--- a/src/apps/deskbar/BarView.cpp
+++ b/src/apps/deskbar/BarView.cpp
@@ -443,6 +443,9 @@ TBarView::PlaceTray(bool vertSwap, bool leftSwap)
 void
 TBarView::PlaceApplicationBar()
 {
+	if (fScrollArrowView != NULL)
+		fScrollArrowView->DetachScrollers();
+
 	if (fExpando != NULL) {
 		SaveExpandedItems();
 		fExpando->RemoveSelf();