Work around bad codegen from VC++2015 update 2

This commit is contained in:
Thomas Goyne 2016-04-03 11:24:11 -07:00
parent 43f5af556d
commit 8823476275
1 changed files with 4 additions and 2 deletions

View File

@ -317,8 +317,10 @@ void SubsEditBox::OnCommit(int type) {
}
if (type == AssFile::COMMIT_NEW) {
PopulateList(effect_box, &AssDialogue::Effect);
PopulateList(actor_box, &AssDialogue::Actor);
// Without this pointless variable vc++ 2015 passes null to PopulateList
auto vs14_u2_workaround = &AssDialogue::Effect;
PopulateList(effect_box, vs14_u2_workaround);
PopulateList(actor_box, vs14_u2_workaround = &AssDialogue::Actor);
return;
}
else if (type & AssFile::COMMIT_STYLES)