Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

Merge remote-tracking branch 'origin/ryzom/ui/improvements' into yubo

Browse Source
fix_opengl_on_mac
Ulukyn 5 years ago
parent 0cf26cbdf8 2f635117f7
commit c639bb3c07
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File

6
code/ryzom/client/src/interface_v3/group_map.cpp
Unescape Escape View File

@ -3926,9 +3926,9 @@ REGISTER_ACTION_HANDLER(CAHLandMarkSelected, "land_mark_selected");
// Remove a user landmark // Remove a user landmark
class CAHRemoveUserLandMark : public IActionHandler class CAHRemoveUserLandMark : public IActionHandler
{ {
virtual void execute (CCtrlBase *pCaller, const string &/* params */) virtual void execute (CCtrlBase * /* pCaller */, const string &/* params */)
{ {
CCtrlButton *button = dynamic_cast<CCtrlButton *>(pCaller); CCtrlButton *button = dynamic_cast<CCtrlButton*>(CWidgetManager::getInstance()->getCtrlLaunchingModal());
if (!button) return; if (!button) return;
CGroupMap *map = dynamic_cast<CGroupMap *>(button->getParent()); CGroupMap *map = dynamic_cast<CGroupMap *>(button->getParent());
if (!map) return; if (!map) return;
@ -3936,6 +3936,8 @@ class CAHRemoveUserLandMark : public IActionHandler
// close the rename window & create window // close the rename window & create window
closeLandMarkNameDialog(); closeLandMarkNameDialog();
LastSelectedLandMark = NULL; LastSelectedLandMark = NULL;
// close confirmation
CAHManager::getInstance()->runActionHandler("leave_modal", NULL);
} }
}; };
REGISTER_ACTION_HANDLER(CAHRemoveUserLandMark, "remove_user_landmark"); REGISTER_ACTION_HANDLER(CAHRemoveUserLandMark, "remove_user_landmark");

Write Preview
Loading…
Cancel
Save