[Scummvm-git-logs] scummvm branch-2-6 -> 9d12e006fd3c82936bda8f36477d44a5ea336e89

[criezy]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9d12e006fd AGS: Removed a too early call to pl_stop_plugins() and fixed another


Commit: 9d12e006fd3c82936bda8f36477d44a5ea336e89
    https://github.com/scummvm/scummvm/commit/9d12e006fd3c82936bda8f36477d44a5ea336e89
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2022-06-24T20:56:16+01:00

Commit Message:
AGS: Removed a too early call to pl_stop_plugins() and fixed another

There's one call in unload_game_file(), which should be called after
all objects that may have been provided by plugins are disposed
(fonts, managed objects).

>From upstream 462cabe7353fc75f3cf70222a97028066f12f030

Changed paths:
    engines/ags/engine/ac/game.cpp
    engines/ags/engine/main/quit.cpp


diff --git a/engines/ags/engine/ac/game.cpp b/engines/ags/engine/ac/game.cpp
index 1fdb3f8c88f..3a1908ed4ba 100644
--- a/engines/ags/engine/ac/game.cpp
+++ b/engines/ags/engine/ac/game.cpp
@@ -425,9 +425,9 @@ void unload_game_file() {
 
 	free_all_fonts();
 
-	pl_stop_plugins();
 	ccRemoveAllSymbols();
 	ccUnregisterAllObjects();
+	pl_stop_plugins();
 
 	free_do_once_tokens();
 	_GP(play).gui_draw_order.clear();
diff --git a/engines/ags/engine/main/quit.cpp b/engines/ags/engine/main/quit.cpp
index 77a8413ad45..4b62d07a216 100644
--- a/engines/ags/engine/main/quit.cpp
+++ b/engines/ags/engine/main/quit.cpp
@@ -208,8 +208,6 @@ void quit_free() {
 
 	_G(our_eip) = 9016;
 
-	pl_stop_plugins();
-
 	quit_check_dynamic_sprites(qreason);
 
 	if (_G(use_cdplayer))