Skip to content

Commit

Permalink
Merge branch 'praydog:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
joeyhodge authored Nov 30, 2024
2 parents 311a577 + dc3cb6d commit f1a8eea
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/mods/ScriptRunner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1169,6 +1169,7 @@ void ScriptRunner::spew_error(const std::string& p) {

void ScriptRunner::reset_scripts() {
std::scoped_lock _{ m_access_mutex };
std::scoped_lock __{ g_framework->get_hook_monitor_mutex() }; // Stops D3D monitor from attempting to re-hook during long script startups

{
std::unique_lock _{ m_script_error_mutex };
Expand Down

0 comments on commit f1a8eea

Please sign in to comment.