[Scummvm-git-logs] scummvm master -> dad55715928d2ae904ae10459f65edab3bc56317

[bgK]

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:
dad5571592 3DS: Fix crash when closing the console while the 3DS options dialog is open


Commit: dad55715928d2ae904ae10459f65edab3bc56317
    https://github.com/scummvm/scummvm/commit/dad55715928d2ae904ae10459f65edab3bc56317
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2020-05-11T18:29:08+02:00

Commit Message:
3DS: Fix crash when closing the console while the 3DS options dialog is open

Changed paths:
    backends/platform/3ds/osystem-events.cpp


diff --git a/backends/platform/3ds/osystem-events.cpp b/backends/platform/3ds/osystem-events.cpp
index a36d4eef1d..b75955ab29 100644
--- a/backends/platform/3ds/osystem-events.cpp
+++ b/backends/platform/3ds/osystem-events.cpp
@@ -442,13 +442,14 @@ void OSystem_3DS::runOptionsDialog() {
 
 	optionsDialogRunning = true;
 
+	PauseToken pauseToken;
 	OptionsDialog dialog;
 	if (g_engine) {
-		_sleepPauseToken = g_engine->pauseEngine();
+		pauseToken = g_engine->pauseEngine();
 	}
 	int result = dialog.runModal();
 	if (g_engine) {
-		_sleepPauseToken.clear();
+		pauseToken.clear();
 	}
 
 	if (result > 0) {