From 748a913a6d92ed7046b2c32136625ba5b6dd1510 Mon Sep 17 00:00:00 2001
From: aliaspider <aliaspider@gmail.com>
Date: Fri, 3 Jun 2016 11:36:48 +0100
Subject: [PATCH] (task_database_cue) more ps1 scanning fixes.

---
 tasks/task_database_cue.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/tasks/task_database_cue.c b/tasks/task_database_cue.c
index adc819aeba..0eddecf2a1 100644
--- a/tasks/task_database_cue.c
+++ b/tasks/task_database_cue.c
@@ -145,7 +145,7 @@ static int detect_ps1_game_sub(const char *track_path,
 {
    uint8_t* tmp;
    uint8_t* boot_file;
-   int i, skip, frame_size, is_mode1, cd_sector;
+   int skip, frame_size, is_mode1, cd_sector;
    uint8_t buffer[2048 * 2] = {0};
    RFILE                *fp = filestream_open(track_path, RFILE_MODE_READ, -1);
    if (!fp)
@@ -219,14 +219,18 @@ static int detect_ps1_game_sub(const char *track_path,
    *game_id++ = toupper(*tmp++);
    *game_id++ = toupper(*tmp++);
    *game_id++ = toupper(*tmp++);
-   *game_id++ = '-';      
-   tmp++;
-   for(i = 0; i < 5; i++)
+   *game_id++ = '-';
+
+   if(!isalnum(*tmp))
+      tmp++;
+
+   while(isalnum(*tmp))
    {
+      *game_id++ = *tmp++;
       if(*tmp == '.')
          tmp++;
-      *game_id++ = *tmp++;
    }
+
    *game_id = 0;
 
    filestream_close(fp);