From 5ffc3165c08a1820f01ee39598acce098ee1122f Mon Sep 17 00:00:00 2001
From: apistol78 <anders@pistol.one>
Date: Wed, 6 Mar 2024 16:19:44 +0100
Subject: [PATCH] Traktor: Minor fix in Path class when concatenating two
 paths. Also cleaning up in FileDialog.

---
 code/Core/Io/Path.cpp  | 17 ++++++++++-------
 code/Ui/FileDialog.cpp | 20 ++++++++++----------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/code/Core/Io/Path.cpp b/code/Core/Io/Path.cpp
index b458a6b09b..97a998b6fc 100644
--- a/code/Core/Io/Path.cpp
+++ b/code/Core/Io/Path.cpp
@@ -199,7 +199,12 @@ Path Path::operator + (const Path& rh) const
 		return rh;
 	if (empty())
 		return rh;
-	return Path(getPathName() + L"/" + rh.getPathName());
+
+	const std::wstring lh = getPathName();
+	if (!lh.empty() && lh.back() == L'/')
+		return Path(lh + rh.getPathName());
+	else
+		return Path(lh + L"/" + rh.getPathName());
 }
 
 bool Path::operator == (const Path& rh) const
@@ -230,15 +235,15 @@ void Path::resolve()
 
 	for (;;)
 	{
-		size_t s = tmp.find(L"$(");
+		const size_t s = tmp.find(L"$(");
 		if (s == std::string::npos)
 			break;
 
-		size_t e = tmp.find(L")", s + 2);
+		const size_t e = tmp.find(L")", s + 2);
 		if (e == std::string::npos)
 			break;
 
-		std::wstring name = tmp.substr(s + 2, e - s - 2);
+		const std::wstring name = tmp.substr(s + 2, e - s - 2);
 
 		if (OS::getInstance().getEnvironment(name, env))
 			tmp = tmp.substr(0, s) + replaceAll(env, L'\\', L'/') + tmp.substr(e + 1);
@@ -256,13 +261,11 @@ void Path::resolve()
 	m_relative = true;
 	while (!tmp.empty())
 	{
-		if (tmp[0] == L'/')
+		if (tmp[0] == L'/' || tmp[0] == L'~')
 		{
 			m_relative = false;
 			tmp = tmp.substr(1);
 		}
-		else if (tmp[0] == L'~')
-			m_relative = false;
 		else
 			break;
 	}
diff --git a/code/Ui/FileDialog.cpp b/code/Ui/FileDialog.cpp
index d6ccb8aacd..9f51f18891 100644
--- a/code/Ui/FileDialog.cpp
+++ b/code/Ui/FileDialog.cpp
@@ -59,9 +59,9 @@ bool FileDialog::create(Widget* parent, const std::wstring& key, const std::wstr
 
 	// Sort by directory first then name.
 	m_gridFiles->setSort([](const GridRow* r1, const GridRow* r2) -> bool {
-		auto f1 = r1->getData< File >(L"FILE");
+		const auto f1 = r1->getData< File >(L"FILE");
 		T_FATAL_ASSERT(f1 != nullptr);
-		auto f2 = r2->getData< File >(L"FILE");
+		const auto f2 = r2->getData< File >(L"FILE");
 		T_FATAL_ASSERT(f2 != nullptr);
 
 		if (f1->isDirectory() && !f2->isDirectory())
@@ -69,8 +69,8 @@ bool FileDialog::create(Widget* parent, const std::wstring& key, const std::wstr
 		if (!f1->isDirectory() && f2->isDirectory())
 			return false;
 
-		auto fn1 = f1->getPath().getFileNameNoExtension();
-		auto fn2 = f2->getPath().getFileNameNoExtension();
+		const std::wstring fn1 = f1->getPath().getFileNameNoExtension();
+		const std::wstring fn2 = f2->getPath().getFileNameNoExtension();
 		return compareIgnoreCase(fn1, fn2) < 0;
 	});
 
@@ -78,7 +78,7 @@ bool FileDialog::create(Widget* parent, const std::wstring& key, const std::wstr
 		auto selectedRow = m_gridFiles->getSelectedRow();
 		if (selectedRow)
 		{
-			auto file = selectedRow->getData< File >(L"FILE");
+			const auto file = selectedRow->getData< File >(L"FILE");
 			T_FATAL_ASSERT(file != nullptr);
 
 			if (!file->isDirectory())
@@ -90,7 +90,7 @@ bool FileDialog::create(Widget* parent, const std::wstring& key, const std::wstr
 	});
 
 	m_gridFiles->addEventHandler< GridRowDoubleClickEvent >([&](GridRowDoubleClickEvent* event) {
-		auto file = event->getRow()->getData< File >(L"FILE");
+		const auto file = event->getRow()->getData< File >(L"FILE");
 		T_FATAL_ASSERT(file != nullptr);
 
 		if (file->isDirectory())
@@ -149,11 +149,11 @@ DialogResult FileDialog::showModal(Path& outPath)
 
 	if (!m_editFileName)
 	{
-		auto selectedRow = m_gridFiles->getSelectedRow();
+		const auto selectedRow = m_gridFiles->getSelectedRow();
 		if (selectedRow == nullptr)
 			return DialogResult::Cancel;
 
-		auto file = selectedRow->getData< File >(L"FILE");
+		const auto file = selectedRow->getData< File >(L"FILE");
 		T_FATAL_ASSERT(file != nullptr);
 
 		if (file->isDirectory())
@@ -191,7 +191,7 @@ DialogResult FileDialog::showModal(std::vector< Path >& outPaths)
 
 	for (auto row : m_gridFiles->getRows(ui::GridView::GfSelectedOnly))
 	{
-		auto file = row->getData< File >(L"FILE");
+		const auto file = row->getData< File >(L"FILE");
 		T_FATAL_ASSERT(file != nullptr);
 
 		if (file->isDirectory())
@@ -266,7 +266,7 @@ void FileDialog::updateFiles()
 	m_gridFiles->removeAllRows();
 	for (auto file : files)
 	{
-		auto fn = file->getPath().getFileName();
+		const std::wstring fn = file->getPath().getFileName();
 		if (fn == L"." || fn == L".." || file->isHidden())
 			continue;