From c204d7b33fb7408eaebb7dd29f889db835b2984d Mon Sep 17 00:00:00 2001
From: Sven <40953353+RetroSven@users.noreply.github.com>
Date: Tue, 2 Oct 2018 13:58:58 -0400
Subject: [PATCH 1/4] do not display applying cheat message unless there are
 actually cheats

---
 managers/cheat_manager.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/managers/cheat_manager.c b/managers/cheat_manager.c
index c2ee0f5980..b4cca117ca 100644
--- a/managers/cheat_manager.c
+++ b/managers/cheat_manager.c
@@ -88,8 +88,11 @@ void cheat_manager_apply_cheats(void)
             core_set_cheat(&cheat_info);
       }
    }
-    runloop_msg_queue_push(msg_hash_to_str(MSG_APPLYING_CHEAT), 1, 180, true);
-    RARCH_LOG("%s\n", msg_hash_to_str(MSG_APPLYING_CHEAT));
+
+   if ( cheat_manager_state.size > 0 ) {
+      runloop_msg_queue_push(msg_hash_to_str(MSG_APPLYING_CHEAT), 1, 180, true);
+      RARCH_LOG("%s\n", msg_hash_to_str(MSG_APPLYING_CHEAT));
+   }
 
 #ifdef HAVE_CHEEVOS
    data_bool = idx != 0;

From 4d0547adcd14a8c974f694804e11f0b57c54e48b Mon Sep 17 00:00:00 2001
From: Sven <40953353+RetroSven@users.noreply.github.com>
Date: Tue, 2 Oct 2018 14:03:59 -0400
Subject: [PATCH 2/4] code style

---
 managers/cheat_manager.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/managers/cheat_manager.c b/managers/cheat_manager.c
index b4cca117ca..3f733e2eb9 100644
--- a/managers/cheat_manager.c
+++ b/managers/cheat_manager.c
@@ -89,7 +89,8 @@ void cheat_manager_apply_cheats(void)
       }
    }
 
-   if ( cheat_manager_state.size > 0 ) {
+   if ( cheat_manager_state.size > 0 )
+   {
       runloop_msg_queue_push(msg_hash_to_str(MSG_APPLYING_CHEAT), 1, 180, true);
       RARCH_LOG("%s\n", msg_hash_to_str(MSG_APPLYING_CHEAT));
    }

From ce8dc3634f6dac263f1fa6f7572d43fc86e3bee1 Mon Sep 17 00:00:00 2001
From: Sven <40953353+RetroSven@users.noreply.github.com>
Date: Tue, 2 Oct 2018 14:06:40 -0400
Subject: [PATCH 3/4] style

---
 managers/cheat_manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/managers/cheat_manager.c b/managers/cheat_manager.c
index 3f733e2eb9..73971f69d2 100644
--- a/managers/cheat_manager.c
+++ b/managers/cheat_manager.c
@@ -89,7 +89,7 @@ void cheat_manager_apply_cheats(void)
       }
    }
 
-   if ( cheat_manager_state.size > 0 )
+   if (cheat_manager_state.size > 0)
    {
       runloop_msg_queue_push(msg_hash_to_str(MSG_APPLYING_CHEAT), 1, 180, true);
       RARCH_LOG("%s\n", msg_hash_to_str(MSG_APPLYING_CHEAT));

From fc40e6ac85e207dda52bdd6f55a2ca51f5a6bdca Mon Sep 17 00:00:00 2001
From: Sven <40953353+RetroSven@users.noreply.github.com>
Date: Tue, 2 Oct 2018 15:15:45 -0400
Subject: [PATCH 4/4] fix gdi scanning - database only contains crcs for track
 1 - so do not try to find largest track - just stop on track 1

---
 tasks/task_database.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasks/task_database.c b/tasks/task_database.c
index 48d70d33b7..e7b1fae035 100644
--- a/tasks/task_database.c
+++ b/tasks/task_database.c
@@ -455,7 +455,7 @@ static int task_database_gdi_get_crc(const char *name, uint32_t *crc)
 
    track_path[0] = '\0';
 
-   rv = gdi_find_track(name, false, track_path, PATH_MAX_LENGTH);
+   rv = gdi_find_track(name, true, track_path, PATH_MAX_LENGTH);
 
    if (rv < 0)
    {