diff --git a/src/preferences/input/MouseSettings.cpp b/src/preferences/input/MouseSettings.cpp index 8774d5bb95..1212ef262e 100644 --- a/src/preferences/input/MouseSettings.cpp +++ b/src/preferences/input/MouseSettings.cpp @@ -33,7 +33,7 @@ MouseSettings::MouseSettings(BString name) : fName(name) { - if (_RetrieveSettings() != B_OK) { + if (_RetrieveSettings() != B_OK) Defaults(); fOriginalSettings = fSettings; @@ -503,10 +503,9 @@ MultipleMouseSettings::AddMouseSettings(BString mouse_name) { if(fDeprecatedMouseSettings != NULL) { MouseSettings* RetrievedSettings = new (std::nothrow) MouseSettings - (*fDeprecatedMouseSettings); + (*(fDeprecatedMouseSettings->GetSettings()), mouse_name); if (RetrievedSettings != NULL) { - RetrievedSettings->fName = mouse_name; fMouseSettingsObject.insert(std::pair (mouse_name, RetrievedSettings)); diff --git a/src/preferences/input/MouseSettings.h b/src/preferences/input/MouseSettings.h index ee724075c6..4a51181934 100644 --- a/src/preferences/input/MouseSettings.h +++ b/src/preferences/input/MouseSettings.h @@ -77,7 +77,7 @@ private: mode_mouse fMode, fOriginalMode; mode_focus_follows_mouse fFocusFollowsMouseMode; mode_focus_follows_mouse fOriginalFocusFollowsMouseMode; - bool fAcceptFirstClick + bool fAcceptFirstClick; bool fOriginalAcceptFirstClick; mouse_settings fSettings, fOriginalSettings;