From 7d8f3d26a626ae0f1986b165a311efe0cf43b115 Mon Sep 17 00:00:00 2001
From: Silent <zdanio95@gmail.com>
Date: Tue, 8 Jun 2021 17:13:47 +0200
Subject: [PATCH] Do not allow loading save states via commandline in Hardcore
 mode

---
 src/frontend-common/common_host_interface.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/frontend-common/common_host_interface.cpp b/src/frontend-common/common_host_interface.cpp
index 696e8e97b..a6c47140f 100644
--- a/src/frontend-common/common_host_interface.cpp
+++ b/src/frontend-common/common_host_interface.cpp
@@ -174,6 +174,11 @@ bool CommonHostInterface::BootSystem(std::shared_ptr<SystemBootParameters> param
   if (m_display && m_fullscreen_ui_enabled)
     FullscreenUI::EnsureGameListLoaded();
 
+  // In Challenge mode, do not allow loading a save state under any circumstances
+  // If it's present, drop it
+  if (IsCheevosChallengeModeActive())
+    parameters->state_stream.reset();
+
   ApplyRendererFromGameSettings(parameters->filename);
 
   if (!HostInterface::BootSystem(parameters))