From 1dedefaf231d4799e9a8927f68ca4af7bd0cfd3a Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Mon, 2 Mar 2015 11:29:11 -0500
Subject: [PATCH] Tracker: don't initialize layouts when we're not supposed to.

This didn't cause any problems before because all the views that don't
use layouts reimplemented this function. But that may not be the case in
the future.
---
 src/kits/tracker/ContainerWindow.cpp | 3 ++-
 src/kits/tracker/ContainerWindow.h   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/kits/tracker/ContainerWindow.cpp b/src/kits/tracker/ContainerWindow.cpp
index 97346faf16..14a0786be0 100644
--- a/src/kits/tracker/ContainerWindow.cpp
+++ b/src/kits/tracker/ContainerWindow.cpp
@@ -461,6 +461,7 @@ BContainerWindow::BContainerWindow(LockingList<BWindow>* list,
 	:
 	BWindow(InitialWindowRect(feel), "TrackerWindow", look, feel, flags,
 		workspace),
+	fUseLayouts(useLayouts),
 	fMenuContainer(NULL),
 	fPoseContainer(NULL),
 	fBorderedView(NULL),
@@ -1011,7 +1012,7 @@ BContainerWindow::RestoreState(const BMessage &message)
 void
 BContainerWindow::RestoreStateCommon()
 {
-	if (!fIsDesktop)
+	if (!fIsDesktop && fUseLayouts)
 		InitLayout();
 
 	if (BootedInSafeMode())
diff --git a/src/kits/tracker/ContainerWindow.h b/src/kits/tracker/ContainerWindow.h
index 4b48b857f6..58b8d205e6 100644
--- a/src/kits/tracker/ContainerWindow.h
+++ b/src/kits/tracker/ContainerWindow.h
@@ -280,6 +280,7 @@ protected:
 		BObjectList<Model>*, void*, BStringList&);
 	void LoadAddOn(BMessage*);
 
+	bool fUseLayouts;
 	BGroupLayout* fRootLayout;
 	BGroupView* fMenuContainer;
 	BGridView* fPoseContainer;