FileManager: Canonicalize paths when opening them.

2 files changed, 4 insertions, 2 deletions

diff --git a/Applications/FileManager/DirectoryTableModel.cpp b/Applications/FileManager/DirectoryTableModel.cpp
index c871d29342..712c7e22da 100644
--- a/Applications/FileManager/DirectoryTableModel.cpp
+++ b/Applications/FileManager/DirectoryTableModel.cpp
@@ -187,8 +187,10 @@ void DirectoryTableModel::update()
     did_update();
 }
 
-void DirectoryTableModel::open(const String& path)
+void DirectoryTableModel::open(const String& a_path)
 {
+    FileSystemPath canonical_path(a_path);
+    auto path = canonical_path.string();
     if (m_path == path)
         return;
     DIR* dirp = opendir(path.characters());
diff --git a/Applications/FileManager/DirectoryTableView.cpp b/Applications/FileManager/DirectoryTableView.cpp
index f689a99ff4..4e116a1981 100644
--- a/Applications/FileManager/DirectoryTableView.cpp
+++ b/Applications/FileManager/DirectoryTableView.cpp
@@ -37,5 +37,5 @@ void DirectoryTableView::set_status_message(const String& message)
 
 void DirectoryTableView::open_parent_directory()
 {
-    model().open("..");
+    model().open(String::format("%s/..", model().path().characters()));
 }