From 4988540cb16699c715a737e473cb68e64f4f40ea Mon Sep 17 00:00:00 2001 From: Karol Kosek Date: Mon, 2 Aug 2021 16:19:47 +0200 Subject: [PATCH] FileManager: Use the current directory as one of the initial locations This change makes `cd /bin; FileManager` open the app in /bin. --- Userland/Applications/FileManager/main.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Userland/Applications/FileManager/main.cpp b/Userland/Applications/FileManager/main.cpp index c2f17ea74a..e0384a2333 100644 --- a/Userland/Applications/FileManager/main.cpp +++ b/Userland/Applications/FileManager/main.cpp @@ -98,8 +98,9 @@ int main(int argc, char** argv) // our initial location is defined as, in order of precedence: // 1. the command-line path argument (e.g. FileManager /bin) - // 2. the user's home directory - // 3. the root directory + // 2. the current directory + // 3. the user's home directory + // 4. the root directory if (!initial_location.is_empty()) { if (!ignore_path_resolution) @@ -109,6 +110,9 @@ int main(int argc, char** argv) is_selection_mode = true; } + if (initial_location.is_empty()) + initial_location = Core::File::current_working_directory(); + if (initial_location.is_empty()) initial_location = Core::StandardPaths::home_directory();