From 29f04e867acca017f6dd53dcb455143720561609 Mon Sep 17 00:00:00 2001 From: John Scipione Date: Fri, 19 Aug 2016 10:13:44 -0700 Subject: [PATCH] Revert "Keymap: Handle uninitialized ref" This reverts commit 1e5f78f522bbdbd9af987df452d756cee4f6d32f. --- src/preferences/keymap/KeymapWindow.cpp | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/src/preferences/keymap/KeymapWindow.cpp b/src/preferences/keymap/KeymapWindow.cpp index 7354b227cf..0b17345b94 100644 --- a/src/preferences/keymap/KeymapWindow.cpp +++ b/src/preferences/keymap/KeymapWindow.cpp @@ -136,27 +136,8 @@ KeymapWindow::KeymapWindow() get_ref_for_path(path.Path(), &ref); BDirectory userKeymapsDir(&ref); - if (userKeymapsDir.InitCheck() != B_OK) { - // 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); - } - } + if (userKeymapsDir.InitCheck() != B_OK) + create_directory(path.Path(), S_IRWXU | S_IRWXG | S_IRWXO); BMessenger messenger(this); fOpenPanel = new BFilePanel(B_OPEN_PANEL, &messenger, &ref,