From 900a3966e236f15f56e6b58059d059868020409d Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sun, 24 Mar 2019 12:27:02 +0100 Subject: [PATCH] FileManager: Don't show "." and ".." in directory views. --- Applications/FileManager/DirectoryModel.cpp | 2 ++ Applications/FileManager/DirectoryTableView.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Applications/FileManager/DirectoryModel.cpp b/Applications/FileManager/DirectoryModel.cpp index 16e0b3e481..a1ea8abdaa 100644 --- a/Applications/FileManager/DirectoryModel.cpp +++ b/Applications/FileManager/DirectoryModel.cpp @@ -227,6 +227,8 @@ void DirectoryModel::update() while (auto* de = readdir(dirp)) { Entry entry; entry.name = de->d_name; + if (entry.name == "." || entry.name == "..") + continue; struct stat st; int rc = lstat(String::format("%s/%s", m_path.characters(), de->d_name).characters(), &st); if (rc < 0) { diff --git a/Applications/FileManager/DirectoryTableView.cpp b/Applications/FileManager/DirectoryTableView.cpp index 570b99c4a5..f11546f474 100644 --- a/Applications/FileManager/DirectoryTableView.cpp +++ b/Applications/FileManager/DirectoryTableView.cpp @@ -12,7 +12,7 @@ DirectoryView::DirectoryView(GWidget* parent) m_table_view = new GTableView(this); m_table_view->set_model(GSortingProxyModel::create(m_model.copy_ref())); - model().set_key_column_and_sort_order(DirectoryModel::Column::Name, GSortOrder::Ascending); + m_table_view->model()->set_key_column_and_sort_order(DirectoryModel::Column::Name, GSortOrder::Ascending); m_item_view->set_model_column(DirectoryModel::Column::Name);