From 8823476275939c35f6d35315e2d88a6a38196f64 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Sun, 3 Apr 2016 11:24:11 -0700 Subject: [PATCH] Work around bad codegen from VC++2015 update 2 --- src/subs_edit_box.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/subs_edit_box.cpp b/src/subs_edit_box.cpp index 07020c713..4f205c5cb 100644 --- a/src/subs_edit_box.cpp +++ b/src/subs_edit_box.cpp @@ -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)