Merge with develop

--HG--
branch : compatibility-develop
hg/compatibility-develop
Nimetu 6 years ago
commit d483d64dfc

@ -2853,6 +2853,7 @@ void CGroupMap::removeUserLandMark(CCtrlButton *button)
updateUserLandMarks(); updateUserLandMarks();
} }
CInterfaceManager::getInstance()->saveLandmarks();
return; return;
} }
} }
@ -2872,6 +2873,8 @@ void CGroupMap::updateUserLandMark(CCtrlButton *button, const ucstring &newTitle
updateLandMarkButton(_UserLM[k], getUserLandMarkOptions(k)); updateLandMarkButton(_UserLM[k], getUserLandMarkOptions(k));
button->setDefaultContextHelp(newTitle); button->setDefaultContextHelp(newTitle);
CInterfaceManager::getInstance()->saveLandmarks();
return; return;
} }
} }

@ -3097,7 +3097,6 @@ class CAHSaveUI : public IActionHandler
{ {
CInterfaceManager::getInstance()->saveKeys(true); CInterfaceManager::getInstance()->saveKeys(true);
CInterfaceManager::getInstance()->saveConfig(true); CInterfaceManager::getInstance()->saveConfig(true);
CInterfaceManager::getInstance()->saveLandmarks(true);
} }
}; };
REGISTER_ACTION_HANDLER (CAHSaveUI, "save_ui"); REGISTER_ACTION_HANDLER (CAHSaveUI, "save_ui");

Loading…
Cancel
Save