Part two of modifications for this PR.

Author: jyetcv

ui/xui/actions.cc

@@ -60,42 +60,48 @@ void ActionLoadDiscFile(const char *file_path)
         xemu_queue_error_message(error_get_pretty(err));
         error_free(err);
     } else {
-        if (file_path && file_path[0]) {
-            if (!g_config.general.recent.discs) {
-                g_config.general.recent.discs = g_new0(const char *, 1);
-                g_config.general.recent.discs_count = 0;
-            }
+        if (!g_config.general.recent.discs) {
+            g_config.general.recent.discs = g_new0(const char *, 1);
+            g_config.general.recent.discs_count = 0;
+        }
 
-            int i;
-            for (i = 0; i < g_config.general.recent.discs_count; i++) {
-                if (g_strcmp0(g_config.general.recent.discs[i], file_path) == 0) {
-                    for (int j = i; j > 0; j--) {
-                        g_config.general.recent.discs[j] = g_config.general.recent.discs[j-1];
-                    }
-                    g_config.general.recent.discs[0] = g_strdup(file_path);
-                    return;
+                // If current game is already in history,
+        // move other game entries down,
+        // then move the current game to the most recent slot.
+        for (unsigned i = 0; i < g_config.general.recent.discs_count; i++) {
+            if (g_strcmp0(g_config.general.recent.discs[i], file_path) == 0) {
+                const char *current_path = g_config.general.recent.discs[i];
+                for (unsigned int j = i; j > 0; j--) {
+                    g_config.general.recent.discs[j] =
+                        g_config.general.recent.discs[j - 1];
                 }
+                g_config.general.recent.discs[0] = current_path;
+                return;
+            }
+        }
+        // Free a slot for our entry.
+        if (g_config.general.recent.discs_count >= MAX_RECENT_DISCS) {
+            for (unsigned i = MAX_RECENT_DISCS;
+                 i < g_config.general.recent.discs_count; i++) {
+                g_free((void *)g_config.general.recent.discs[i]);
             }
 
-            if (i == g_config.general.recent.discs_count) {
-                if (g_config.general.recent.discs_count >= MAX_RECENT_DISCS) {
-                    for (int j = MAX_RECENT_DISCS; j < g_config.general.recent.discs_count; j++) {
-                        g_free((void*)g_config.general.recent.discs[j]);
-                    }
-                    g_config.general.recent.discs_count = MAX_RECENT_DISCS;
-                } else {
-                    const char **new_discs = g_renew(const char *, g_config.general.recent.discs, 
-                                               g_config.general.recent.discs_count + 1);
-                    g_config.general.recent.discs = new_discs;
-                    g_config.general.recent.discs_count++;
-                }
+            g_free((void *)g_config.general.recent.discs[MAX_RECENT_DISCS - 1]);
+            g_config.general.recent.discs_count = MAX_RECENT_DISCS;
+        } else {
+            // Allocate new space.
+            const char **new_discs =
+                g_renew(const char *, g_config.general.recent.discs,
+                        g_config.general.recent.discs_count + 1);
+            g_config.general.recent.discs = new_discs;
+            g_config.general.recent.discs_count++;
+        }
 
-                for (int i = g_config.general.recent.discs_count - 1; j > 0; j--) {
-                    g_config.general.recent.discs[i] = g_config.general.recent.discs[j-1];
-                }
-                g_config.general.recent.discs[0] = g_strdup(file_path);
-            }
+        for (unsigned i = g_config.general.recent.discs_count - 1; i > 0; i--) {
+            g_config.general.recent.discs[i] =
+                g_config.general.recent.discs[i - 1];
         }
+        g_config.general.recent.discs[0] = g_strdup(file_path);
     }
 }
 
@@ -120,7 +126,7 @@ void ActionShutdown(void)
 
 void ActionScreenshot(void)
 {
-	g_screenshot_pending = true;
+    g_screenshot_pending = true;
 }
 
 void ActionActivateBoundSnapshot(int slot, bool save)
@@ -154,8 +160,8 @@ void ActionLoadSnapshotChecked(const char *name)
 
 void ActionClearDiscRecent(void)
 {
-    for (int i = 0; i < g_config.general.recent.discs_count; i++) {
-        g_free((void*)g_config.general.recent.discs[i]);
+    for (unsigned i = 0; i < g_config.general.recent.discs_count; i++) {
+        g_free((void *)g_config.general.recent.discs[i]);
     }
     g_free(g_config.general.recent.discs);
     g_config.general.recent.discs = NULL;

ui/xui/main.cc

@@ -159,7 +159,6 @@ void xemu_hud_init(SDL_Window* window, void* sdl_gl_context)
     InitializeStyle();
     g_main_menu.SetNextViewIndex(g_config.general.last_viewed_menu_index);
     first_boot_window.is_open = g_config.general.show_welcome;
-//    g_menubar_recent_list = RecentList::create(&g_config.recent);
 }
 
 void xemu_hud_cleanup(void)

ui/xui/menubar.cc

@@ -144,9 +144,8 @@ void ShowMainMenu()
 
             bool has_any_entries  = (g_config.general.recent.discs_count > 0);
             if (ImGui::BeginMenu("Recent Discs", has_any_entries)) {
-                for (size_t i = 0; i < g_config.general.recent.discs_count; i++) {
+                for (int i = 0; i < g_config.general.recent.discs_count; i++) {
                     const char *disc_path = g_config.general.recent.discs[i];
-                    if (!disc_path) continue;
 
                     const char *filename = g_path_get_basename(disc_path);