* _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
This commit is contained in:
Axel Dörfler
2009-10-28 12:03:04 +00:00
parent 7d6c7206c1
commit b10da4d8c7
+3 -4
View File
@@ -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();