From 1f97d31f2a908bf1a1947fb68d528ed278ef9ed7 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Wed, 27 Nov 2019 07:38:41 -0700
Subject: [PATCH] pause hardcore if core doesn't support achievements

---
 cheevos-new/cheevos.c | 3 +++
 tasks/task_content.c  | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/cheevos-new/cheevos.c b/cheevos-new/cheevos.c
index ee99864548..ac817e1964 100644
--- a/cheevos-new/cheevos.c
+++ b/cheevos-new/cheevos.c
@@ -2560,7 +2560,10 @@ bool rcheevos_load(const void *data)
    rcheevos_hardcore_paused = false;
 
    if (!rcheevos_locals.core_supports || !data)
+   {
+      rcheevos_hardcore_paused = true;
       return false;
+   }
 
    coro = (rcheevos_coro_t*)calloc(1, sizeof(*coro));
 
diff --git a/tasks/task_content.c b/tasks/task_content.c
index eff1695e4e..f2d3507924 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -1087,6 +1087,12 @@ static bool content_file_load(
 
       if (type == RARCH_CONTENT_NONE && !string_is_empty(content_path))
          rcheevos_load(info);
+      else
+         rcheevos_hardcore_paused = true;
+   }
+   else
+   {
+      rcheevos_hardcore_paused = true;
    }
 #endif