Commit music changes only after event completes, not after any contro…

…l=flow tag is executed

data/lua/wml-utils.lua

@@ -154,8 +154,6 @@ function utils.handle_event_commands(cfg, scope_type)
 		end
 		current_exit = "none"
 	end
-	-- Apply music alterations once all the commands have been processed.
-	wesnoth.music_list.force_refresh()
 	return current_exit
 end
 

src/actions/undo_action.cpp

@@ -18,6 +18,7 @@
 #include "variable.hpp" // vconfig
 #include "game_data.hpp"
 #include "units/unit.hpp"
+#include "sound.hpp"
 
 #include <cassert>
 #include <iterator>
@@ -113,6 +114,7 @@ namespace {
 
 		game_events::queued_event q(tag, "", map_location(x1, y1, wml_loc()), map_location(x2, y2, wml_loc()), e.data);
 		resources::lua_kernel->run_wml_action("command", vconfig(e.commands), q);
+		sound::commit_music_changes();
 
 		x1 = oldx1; y1 = oldy1;
 		x2 = oldx2; y2 = oldy2;

src/game_events/handlers.cpp

@@ -30,6 +30,7 @@
 #include "reports.hpp"
 #include "scripting/game_lua_kernel.hpp"
 #include "serialization/string_utils.hpp"
+#include "sound.hpp"
 #include "soundsource.hpp"
 
 #include <iostream>
@@ -127,6 +128,7 @@ void event_handler::handle_event(const queued_event& event_info, handler_ptr& ha
 	// *WARNING*: At this point, dereferencing this could be a memory violation!
 
 	lk.run_wml_action("command", vcfg, event_info);
+	sound::commit_music_changes();
 }
 
 bool event_handler::matches_name(const std::string &name, const game_data * gd) const