From c8ae0dd87c35ee47eaf8281b8460b07118668758 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dancs=C3=B3=20R=C3=B3bert?= <dancso.robert@d-rendszer.hu>
Date: Fri, 30 Nov 2012 21:48:00 +0100
Subject: [PATCH] DriveSetup: Added disk name to the DiskView.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* The disk device name will be shown on the disk map.

Signed-off-by: Axel Dörfler <axeld@pinc-software.de>
---
 src/apps/drivesetup/DiskView.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/apps/drivesetup/DiskView.cpp b/src/apps/drivesetup/DiskView.cpp
index 7dd0df5657..02e8872ed0 100644
--- a/src/apps/drivesetup/DiskView.cpp
+++ b/src/apps/drivesetup/DiskView.cpp
@@ -202,7 +202,13 @@ public:
 
 	virtual bool Visit(BDiskDevice* device)
 	{
-		PartitionView* view = new PartitionView(B_TRANSLATE("Device"), 1.0,
+		const char* name;
+		if (device->Name() != NULL && device->Name()[0] != '\0')
+			name = device->Name();
+		else
+			name = B_TRANSLATE("Device");
+
+		PartitionView* view = new PartitionView(name, 1.0,
 			device->Offset(), 0, device->ID());
 		fViewMap.Put(device->ID(), view);
 		fView->GetLayout()->AddView(view);