From ad992d227b3a0d58778e61b8d874ea09f8c7bfec Mon Sep 17 00:00:00 2001
From: Andre Leiradella <andre@leiradella.com>
Date: Wed, 26 Sep 2018 23:03:31 +0100
Subject: [PATCH] Guard against null settings; only test leaderboards if
 enabled

---
 cheevos/cheevos.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/cheevos/cheevos.c b/cheevos/cheevos.c
index e442957e77..6745c9c198 100644
--- a/cheevos/cheevos.c
+++ b/cheevos/cheevos.c
@@ -972,10 +972,16 @@ void cheevos_test(void)
 
    cheevos_test_cheevo_set(true);
 
-   if (settings->bools.cheevos_test_unofficial)
-      cheevos_test_cheevo_set(false);
-   
-   cheevos_test_leaderboards();
+   if (settings)
+   {
+      if (settings->bools.cheevos_test_unofficial)
+         cheevos_test_cheevo_set(false);
+      
+      if (settings->bools.cheevos_hardcore_mode_enable &&
+          settings->bools.cheevos_leaderboards_enable  &&
+          !cheevos_hardcore_paused)
+         cheevos_test_leaderboards();
+   }
 }
 
 bool cheevos_set_cheats(void)