Merge with develop

--HG--
branch : compatibility-develop
This commit is contained in:
Nimetu 2016-11-13 23:07:03 +02:00
commit 3c6866381f

View file

@ -2444,6 +2444,7 @@ namespace NLGUI
}
break;
case HTML_OPTION:
if (!(_Forms.empty()) && !(_Forms.back().Entries.empty()))
{
// insert the parsed text into the select control
CDBGroupComboBox *cb = _Forms.back().Entries.back().ComboBox;