upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-28 19:32:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

file dialog: add user bookmarks to correct category (fixes #9298)

Browse Source
This commit is contained in:
Subhraman Sarkar 2024-09-05 21:21:21 +05:30
parent 7065ed9fde
commit 346c7c38b3
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/desktop/paths.cpp
View File

@ -150,8 +150,10 @@ inline std::string pretty_path(const std::string& path)
inline config get_bookmarks_config()
{
auto cfg = prefs::get().dir_bookmarks();
return cfg ? *cfg : config{};
const auto& cfg = prefs::get().dir_bookmarks();
return cfg.has_value() ? cfg.value() : config();
// return cfg ? *cfg : config{};
}
inline void commit_bookmarks_config(config& cfg)

2
src/preferences/preferences.hpp
View File

@ -819,7 +819,6 @@ class prefs
static constexpr std::array unsynced_attributes_{
prefs_list::auto_pixel_scale,
prefs_list::core,
prefs_list::dir_bookmarks,
prefs_list::draw_delay,
prefs_list::editor_chosen_addon,
prefs_list::gui2_theme,
@ -841,6 +840,7 @@ class prefs
};
static constexpr std::array unsynced_children_{
prefs_list::editor_recent_files,
prefs_list::dir_bookmarks,
};
static_assert(synced_attributes_.size() + synced_children_.size() + unsynced_attributes_.size() + unsynced_children_.size() == prefs_list::values.size(), "attribute missing from lists of synced or unsynced preferences!");
};