(svn r11892) -Fix (r11879): View switched from ungrouped to all vehicles as ungrouped is not technically a valid group, and ensure dropdown is removed

on any click in the window.
This commit is contained in:
peter1138 2008-01-17 13:37:28 +00:00
parent f5d72cc84c
commit f788298209

View File

@ -305,7 +305,7 @@ static void GroupWndProc(Window *w, WindowEvent *e)
case WE_INVALIDATE_DATA: case WE_INVALIDATE_DATA:
gv->l.flags |= VL_REBUILD; gv->l.flags |= VL_REBUILD;
gl->l.flags |= VL_REBUILD; gl->l.flags |= VL_REBUILD;
if (!IsValidGroupID(gv->group_sel)) { if (!(IsAllGroupID(gv->group_sel) || IsDefaultGroupID(gv->group_sel) || IsValidGroupID(gv->group_sel))) {
gv->group_sel = ALL_GROUP; gv->group_sel = ALL_GROUP;
HideDropDownMenu(w); HideDropDownMenu(w);
} }
@ -503,6 +503,8 @@ static void GroupWndProc(Window *w, WindowEvent *e)
} }
case WE_CLICK: case WE_CLICK:
HideDropDownMenu(w);
switch(e->we.click.widget) { switch(e->we.click.widget) {
case GRP_WIDGET_SORT_BY_ORDER: // Flip sorting method ascending/descending case GRP_WIDGET_SORT_BY_ORDER: // Flip sorting method ascending/descending
gv->l.flags ^= VL_DESC; gv->l.flags ^= VL_DESC;