From b10da4d8c70ed3a971c58415437bf79d88ee8155 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 28 Oct 2009 12:03:04 +0000 Subject: [PATCH] * _UpdateButtons() was called too early, before fCurrentMap, and fAppliedMap were initialized, causing Keymap to lose the current map. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33808 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/preferences/keymap/KeymapWindow.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/preferences/keymap/KeymapWindow.cpp b/src/preferences/keymap/KeymapWindow.cpp index 077adf53cc..12ddeade54 100644 --- a/src/preferences/keymap/KeymapWindow.cpp +++ b/src/preferences/keymap/KeymapWindow.cpp @@ -108,8 +108,6 @@ KeymapWindow::KeymapWindow() fKeyboardLayoutView->SetTarget(fTextControl->TextView()); fTextControl->MakeFocus(); - _UpdateButtons(); - // Make sure the user keymap directory exists BPath path; find_directory(B_USER_SETTINGS_DIRECTORY, &path); @@ -119,9 +117,8 @@ KeymapWindow::KeymapWindow() get_ref_for_path(path.Path(), &ref); BDirectory userKeymapsDir(&ref); - if (userKeymapsDir.InitCheck() != B_OK) { + 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, @@ -154,6 +151,8 @@ KeymapWindow::KeymapWindow() fAppliedMap = fCurrentMap; fCurrentMap.SetTarget(this, new BMessage(kMsgKeymapUpdated)); + _UpdateButtons(); + _UpdateDeadKeyMenu(); _UpdateSwitchShortcutButton();