blob: f4a5c4a4502258ce9a794fdbec72fce394bb0d97 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
--- a/GG/src/dialogs/FileDlg.cpp
+++ b/GG/src/dialogs/FileDlg.cpp
@@ -215,7 +215,7 @@ void FileDlg::CompleteConstruction()
if (!m_init_filename.empty()) {
fs::path filename_path = fs::system_complete(fs::path(m_init_filename));
- m_files_edit->SetText(filename_path.leaf().string());
+ m_files_edit->SetText(filename_path.filename().string());
}
}
@@ -548,7 +548,7 @@ void FileDlg::UpdateList()
if (!m_in_win32_drive_selection) {
// parent directory selector
if ((s_working_dir.string() != s_working_dir.root_path().string() &&
- !s_working_dir.branch_path().string().empty()) ||
+ !s_working_dir.parent_path().string().empty()) ||
Win32Paths())
{
auto row = Wnd::Create<ListBox::Row>();
@@ -694,10 +694,10 @@ void FileDlg::OpenDirectory()
} else if (directory == "..") {
// move to parent directory of current directory
if (s_working_dir.string() != s_working_dir.root_path().string() &&
- !s_working_dir.branch_path().string().empty())
+ !s_working_dir.parent_path().string().empty())
{
// move to new directory
- SetWorkingDirectory(s_working_dir.branch_path());
+ SetWorkingDirectory(s_working_dir.parent_path());
} else {
// switch to drive selection mode
|
