Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Keymap: Handle uninitialized ref

Browse Source 
...trying to get/make Keymaps settings dir if not able to create
the Keymaps directory under settings.

Resolve symlink, if it is a directory, use that directory instead,
otherwise use home directory as a fallback.
This commit is contained in:
John Scipione 2016-08-18 17:27:01 -07:00
parent 46b84951f7
commit 1e5f78f522
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/preferences/keymap/KeymapWindow.cpp
View File

@ -136,8 +136,27 @@ KeymapWindow::KeymapWindow()
get_ref_for_path(path.Path(), &ref); get_ref_for_path(path.Path(), &ref);
BDirectory userKeymapsDir(&ref); BDirectory userKeymapsDir(&ref);
if (userKeymapsDir.InitCheck() != B_OK) if (userKeymapsDir.InitCheck() != B_OK) {
create_directory(path.Path(), S_IRWXU | S_IRWXG | S_IRWXO); // directory does not exist
status_t result = create_directory(path.Path(),
S_IRWXU | S_IRWXG | S_IRWXO);
if (result == B_NOT_A_DIRECTORY) {
// could be a symlink
BEntry entry(&ref, true);
if (entry.InitCheck() == B_OK && entry.Exists()) {
// followed the symlink
result = entry.GetRef(&ref);
}
}
if (result != B_OK) {
// unable to create directory or resolve symlink,
// point ref to home directory
BPath home;
find_directory(B_USER_DIRECTORY, &home);
get_ref_for_path(home.Path(), &ref);
}
}
BMessenger messenger(this); BMessenger messenger(this);
fOpenPanel = new BFilePanel(B_OPEN_PANEL, &messenger, &ref, fOpenPanel = new BFilePanel(B_OPEN_PANEL, &messenger, &ref,