From 97bc2696dbc4e8768e350103c7208a997dbdc001 Mon Sep 17 00:00:00 2001 From: Benau Date: Mon, 29 Aug 2022 11:06:12 +0800 Subject: [PATCH] Fix broken IrrDriver::cancelResChange --- src/graphics/irr_driver.cpp | 2 +- src/graphics/irr_driver.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp index 7b108df08..65de213b7 100644 --- a/src/graphics/irr_driver.cpp +++ b/src/graphics/irr_driver.cpp @@ -1171,7 +1171,7 @@ void IrrDriver::cancelResChange() // is actually called from the gui, i.e. the event loop, i.e. while the // old device is active - so we can't delete this device (which we must // do in applyResolutionSettings) - m_resolution_changing=RES_CHANGE_SAME; + m_resolution_changing=RES_CHANGE_CANCEL; } // cancelResChange diff --git a/src/graphics/irr_driver.hpp b/src/graphics/irr_driver.hpp index 0f2afdb92..90d617983 100644 --- a/src/graphics/irr_driver.hpp +++ b/src/graphics/irr_driver.hpp @@ -114,7 +114,7 @@ private: * the confirmation dialog needs an additional warning message. * Same indicates a change of the resolution (back to the original * one), but no confirmation dialog. */ - enum {RES_CHANGE_NONE, RES_CHANGE_YES, + enum {RES_CHANGE_NONE, RES_CHANGE_YES, RES_CHANGE_CANCEL, RES_CHANGE_SAME, RES_CHANGE_YES_WARN} m_resolution_changing;