From 83c726a34f325ae5be0d5b61b66a97cb41f6973e Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Mon, 21 Oct 2013 10:26:53 +0200
Subject: GetBaseUTF8

---
 src/Directory.cxx | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'src/Directory.cxx')

diff --git a/src/Directory.cxx b/src/Directory.cxx
index 25568bb19..c06090204 100644
--- a/src/Directory.cxx
+++ b/src/Directory.cxx
@@ -24,6 +24,7 @@
 #include "DatabaseLock.hxx"
 #include "SongSort.hxx"
 #include "Song.hxx"
+#include "fs/Traits.hxx"
 #include "util/Error.hxx"
 
 extern "C" {
@@ -112,14 +113,8 @@ const char *
 Directory::GetName() const
 {
 	assert(!IsRoot());
-	assert(path != nullptr);
-
-	const char *slash = strrchr(path, '/');
-	assert((slash == nullptr) == parent->IsRoot());
 
-	return slash != nullptr
-		? slash + 1
-		: path;
+	return PathTraits::GetBaseUTF8(path);
 }
 
 Directory *
-- 
cgit v1.2.3