From 31c3214ef203c91c0dbabeb46e8abe114cb7247a Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 3 Nov 2014 08:19:38 +0100 Subject: [PATCH] Revert "Intel partition: activate the first created partition." This reverts commit d0a662e20a6eb37a59883c2c9377604f8c94cf03. It is better to handle this in Installer when we know which partition will actually be the system one. --- src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp | 4 +--- src/add-ons/disk_systems/intel/PrimaryParameterEditor.cpp | 5 +---- src/add-ons/disk_systems/intel/PrimaryParameterEditor.h | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp b/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp index bc7b23876c..d9c1450048 100644 --- a/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp +++ b/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp @@ -301,9 +301,7 @@ PartitionMapHandle::GetParameterEditor(B_PARAMETER_EDITOR_TYPE type, if (type == B_CREATE_PARAMETER_EDITOR || type == B_PROPERTIES_PARAMETER_EDITOR) { try { - BMutablePartition* partition = Partition(); - int32 count = partition->CountChildren(); - *editor = new PrimaryPartitionEditor(count == 0); + *editor = new PrimaryPartitionEditor(); } catch (std::bad_alloc) { return B_NO_MEMORY; } diff --git a/src/add-ons/disk_systems/intel/PrimaryParameterEditor.cpp b/src/add-ons/disk_systems/intel/PrimaryParameterEditor.cpp index b98b76ac02..0d89a9cfbf 100644 --- a/src/add-ons/disk_systems/intel/PrimaryParameterEditor.cpp +++ b/src/add-ons/disk_systems/intel/PrimaryParameterEditor.cpp @@ -19,15 +19,12 @@ #define B_TRANSLATION_CONTEXT "PrimaryPartitionEditor" -PrimaryPartitionEditor::PrimaryPartitionEditor(bool first) +PrimaryPartitionEditor::PrimaryPartitionEditor() { fActiveCheckBox = new BCheckBox("active", B_TRANSLATE("Active partition"), NULL); fView = new BGroupView(B_VERTICAL); fView->AddChild(fActiveCheckBox); - - // The first partition is active by default. Others are not. - fActiveCheckBox->SetValue(first); } diff --git a/src/add-ons/disk_systems/intel/PrimaryParameterEditor.h b/src/add-ons/disk_systems/intel/PrimaryParameterEditor.h index df60d12976..fad1f1caed 100644 --- a/src/add-ons/disk_systems/intel/PrimaryParameterEditor.h +++ b/src/add-ons/disk_systems/intel/PrimaryParameterEditor.h @@ -16,7 +16,7 @@ class PrimaryPartitionEditor : public BPartitionParameterEditor { public: - PrimaryPartitionEditor(bool first); + PrimaryPartitionEditor(); virtual ~PrimaryPartitionEditor(); virtual BView* View();