From 040848a2afd75d5a8378ab9f88b3a7003be7ca88 Mon Sep 17 00:00:00 2001 From: Till Mayer Date: Fri, 31 Jul 2020 22:12:57 +0200 Subject: [PATCH] FileManager: Build new path of renamed files correctly Fixes #2932. --- Applications/FileManager/PropertiesDialog.cpp | 3 ++- Applications/FileManager/PropertiesDialog.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Applications/FileManager/PropertiesDialog.cpp b/Applications/FileManager/PropertiesDialog.cpp index 3ff5a22e04d..f4aa7f9f047 100644 --- a/Applications/FileManager/PropertiesDialog.cpp +++ b/Applications/FileManager/PropertiesDialog.cpp @@ -75,6 +75,7 @@ PropertiesDialog::PropertiesDialog(GUI::FileSystemModel& model, String path, boo m_name = lexical_path.basename(); m_path = lexical_path.string(); + m_parent_path = lexical_path.dirname(); m_name_box = file_container.add(); m_name_box->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); @@ -188,7 +189,7 @@ void PropertiesDialog::permission_changed(mode_t mask, bool set) String PropertiesDialog::make_full_path(String name) { - return String::format("%s/%s", m_model.root_path().characters(), name.characters()); + return String::format("%s/%s", m_parent_path.characters(), name.characters()); } bool PropertiesDialog::apply_changes() diff --git a/Applications/FileManager/PropertiesDialog.h b/Applications/FileManager/PropertiesDialog.h index 89e84196ef7..424dba58a89 100644 --- a/Applications/FileManager/PropertiesDialog.h +++ b/Applications/FileManager/PropertiesDialog.h @@ -89,6 +89,7 @@ private: RefPtr m_name_box; RefPtr m_icon; String m_name; + String m_parent_path; String m_path; mode_t m_mode; mode_t m_old_mode;