[Scummvm-git-logs] scummvm master -> 0ce133c5ca54378f2f4ccb7a81e7abd7421b5b66

[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:
0ce133c5ca AGS: Fix restarting AGS games after returning to the launcher


Commit: 0ce133c5ca54378f2f4ccb7a81e7abd7421b5b66
    https://github.com/scummvm/scummvm/commit/0ce133c5ca54378f2f4ccb7a81e7abd7421b5b66
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2021-08-31T17:32:33+01:00

Commit Message:
AGS: Fix restarting AGS games after returning to the launcher

The AGSPlatformDriver has an 'instance' static member variable
that was not rest to nullptr when the driver is deleted. This
caused trying to use a deleted driver when restarting an AGS
game after returning to the launcher.

This commit is a quick fix that properly sets this variable to
nullptr when the driver is deleted, but we may want to look
at the possibility to remove this variable altogether.

Changed paths:
    engines/ags/engine/platform/base/ags_platform_driver.h


diff --git a/engines/ags/engine/platform/base/ags_platform_driver.h b/engines/ags/engine/platform/base/ags_platform_driver.h
index 6322fe2d8e..a9e9c19695 100644
--- a/engines/ags/engine/platform/base/ags_platform_driver.h
+++ b/engines/ags/engine/platform/base/ags_platform_driver.h
@@ -69,6 +69,8 @@ enum SetupReturnValue {
 struct AGSPlatformDriver
 // be used as a output target for logging system
 	: public AGS::Shared::IOutputHandler {
+	virtual ~AGSPlatformDriver() { instance = nullptr; }
+
 	virtual void AboutToQuitGame();
 	virtual void Delay(int millis);
 	virtual void DisplayAlert(const char *, ...) = 0;