From fe05e6c359ae47be0d2a0a312a94c76361b770eb Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Mon, 3 Aug 2009 19:05:38 +0000
Subject: [PATCH] Patch by Bryce Groff: Allow the disk system add-ons to return
 a NULL parameter editor, when they don't have any additional parameters to
 edit.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32096 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/apps/drivesetup/CreateParamsPanel.cpp | 77 +++++++++++++++--------
 1 file changed, 52 insertions(+), 25 deletions(-)

diff --git a/src/apps/drivesetup/CreateParamsPanel.cpp b/src/apps/drivesetup/CreateParamsPanel.cpp
index f2c35f32c3..4fa91af216 100644
--- a/src/apps/drivesetup/CreateParamsPanel.cpp
+++ b/src/apps/drivesetup/CreateParamsPanel.cpp
@@ -125,9 +125,11 @@ CreateParamsPanel::MessageReceived(BMessage* message)
 			break;
 
 		case MSG_PARTITION_TYPE:
-			const char* type;
-			message->FindString("type", &type);
-			fEditor->PartitionTypeChanged(type);
+			if (fEditor != NULL) {
+				const char* type;
+				message->FindString("type", &type);
+				fEditor->PartitionTypeChanged(type);
+			}
 			break;
 
 		default:
@@ -185,10 +187,12 @@ CreateParamsPanel::Go(off_t& offset, off_t& size, BString& name,
 		}
 
 		// get editors parameters
-		if (fEditor->FinishedEditing()) {
-			status_t status = fEditor->GetParameters(&parameters);
-			if (status != B_OK)
-				fReturnValue = status;
+		if (fEditor != NULL) {
+			if (fEditor->FinishedEditing()) {
+				status_t status = fEditor->GetParameters(&parameters);
+				if (status != B_OK)
+					fReturnValue = status;
+			}
 		}
 	}
 
@@ -249,32 +253,55 @@ CreateParamsPanel::_CreateViewControls(BPartition* parent, off_t offset,
 		.Add(fTypeMenuField)
 	;
 	BBox* infoBox = new BBox(B_FANCY_BORDER, infoView);
+	BView* rootView;
 
 	parent->GetChildCreationParameterEditor(NULL, &fEditor);
-	BBox* parameterBox = new BBox(B_FANCY_BORDER, fEditor->View());
+	if (fEditor != NULL) {
+		BBox* parameterBox = new BBox(B_FANCY_BORDER, fEditor->View());
 
-	BView* rootView = BGroupLayoutBuilder(B_VERTICAL, 4)
-		.Add(BSpaceLayoutItem::CreateVerticalStrut(5))
+		rootView = BGroupLayoutBuilder(B_VERTICAL, 4)
+			.Add(BSpaceLayoutItem::CreateVerticalStrut(5))
 
-		// slider and types
-		.Add(infoBox)
+			// slider and types
+			.Add(infoBox)
 
-		.Add(BSpaceLayoutItem::CreateVerticalStrut(10))
+			.Add(BSpaceLayoutItem::CreateVerticalStrut(10))
 
-		// editor's view
-		.Add(parameterBox)
+			// editor's view
+			.Add(parameterBox)
 
-		// controls
-		.AddGroup(B_HORIZONTAL, 10)
-			.Add(BSpaceLayoutItem::CreateHorizontalStrut(5))
-			.AddGlue()
-			.Add(fCancelButton)
-			.Add(fOKButton)
-			.Add(BSpaceLayoutItem::CreateHorizontalStrut(5))
-		.End()
+			// controls
+			.AddGroup(B_HORIZONTAL, 10)
+				.Add(BSpaceLayoutItem::CreateHorizontalStrut(5))
+				.AddGlue()
+				.Add(fCancelButton)
+				.Add(fOKButton)
+				.Add(BSpaceLayoutItem::CreateHorizontalStrut(5))
+			.End()
 
-		.Add(BSpaceLayoutItem::CreateVerticalStrut(5))
-	;
+			.Add(BSpaceLayoutItem::CreateVerticalStrut(5))
+		;
+	} else {
+		rootView = BGroupLayoutBuilder(B_VERTICAL, 4)
+			.Add(BSpaceLayoutItem::CreateVerticalStrut(5))
+
+			// slider and types
+			.Add(infoBox)
+
+			.Add(BSpaceLayoutItem::CreateVerticalStrut(10))
+
+			// controls
+			.AddGroup(B_HORIZONTAL, 10)
+				.Add(BSpaceLayoutItem::CreateHorizontalStrut(5))
+				.AddGlue()
+				.Add(fCancelButton)
+				.Add(fOKButton)
+				.Add(BSpaceLayoutItem::CreateHorizontalStrut(5))
+			.End()
+
+			.Add(BSpaceLayoutItem::CreateVerticalStrut(5))
+		;
+	}
 
 	SetLayout(new BGroupLayout(B_HORIZONTAL));
 	AddChild(rootView);