Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fix uninit/release

Browse source 
--HG--
branch : item_group
This commit is contained in:
Guillaume Dupuy 2017-03-18 01:45:40 +01:00
parent 6af0fd168c
commit f222d1736a
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
code/ryzom/client/src/item_group_manager.cpp
View file

@ -77,7 +77,7 @@ void CItemGroup::writeTo(xmlNodePtr node)
for(int i=0;i<removeBeforeEquip.size();i++)
{
xmlNodePtr removeNode = xmlNewChild(groupNode, NULL, (const xmlChar*)"remove", NULL);
xmlSetProp(removeNode, (const xmlChar*)"slot", (const xmlChar*)removeBeforeEquip[i]);
xmlSetProp(removeNode, (const xmlChar*)"slot", (xmlChar*)SLOT_EQUIPMENT::toString(removeBeforeEquip[i]).c_str());
}
}
@ -203,6 +203,18 @@ void CItemGroupManager::linkInterface()
void CItemGroupManager::uninit()
{
saveGroups();
unlinkInterface();
_Groups.clear();
}
void CItemGroupManager::unlinkInterface()
{
// We need to unlink our menu to avoid crash on interface release
CWidgetManager* pWM = CWidgetManager::getInstance();
CGroupMenu *pGroupMenu = dynamic_cast<CGroupMenu*>(pWM->getElementFromId("ui:interface:item_menu_in_bag:item_group_menu"));
CGroupSubMenu *pGroupSubMenu = pGroupMenu->getRootMenu();
pGroupMenu->reset();
pGroupMenu->delGroup(pGroupSubMenu, true);
}
// Inspired from macro parsing

1
code/ryzom/client/src/item_group_manager.h
View file

@ -78,6 +78,7 @@ public:
void saveGroups();
bool loadGroups();
void linkInterface();
void unlinkInterface();
//Return NULL if no group was found
//Return false if no group was found
bool moveGroup(std::string name, INVENTORIES::TInventory dst);