From b3d77689a777168087390b1cac502a24f35b1593 Mon Sep 17 00:00:00 2001
From: bnnm <bananaman255@gmail.com>
Date: Sat, 1 Dec 2018 14:00:59 +0100
Subject: [PATCH] Fix Winamp not showing default subsong title

---
 winamp/in_vgmstream.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/winamp/in_vgmstream.c b/winamp/in_vgmstream.c
index ef88df28..10f2c44a 100644
--- a/winamp/in_vgmstream.c
+++ b/winamp/in_vgmstream.c
@@ -1436,6 +1436,7 @@ __declspec(dllexport) In_Module * winampGetInModule2() {
 #define WINAMP_TAGS_ENTRY_SIZE     2048
 
 typedef struct {
+    int loaded;
     in_char filename[PATH_LIMIT]; /* tags are loaded for this file */
     int tag_count;
 
@@ -1457,8 +1458,9 @@ static void load_tagfile_info(in_char* filename) {
     char *path;
 
 
-    if (settings.tagfile_disable) {
-        last_tags.tag_count = 0; /* maybe  helps if setting changes during play */
+    if (settings.tagfile_disable) { /* reset values if setting changes during play */
+        last_tags.loaded = 0;
+        last_tags.tag_count = 0;
         return;
     }
 
@@ -1469,6 +1471,8 @@ static void load_tagfile_info(in_char* filename) {
         return; /* not changed, tags still apply */
     }
 
+    last_tags.loaded = 0;
+
     /* tags are now for this filename, find tagfile path */
     wa_ichar_to_char(filename_utf8, PATH_LIMIT, filename_clean);
     strcpy(tagfile_path_utf8,filename_utf8);
@@ -1517,6 +1521,7 @@ static void load_tagfile_info(in_char* filename) {
         }
 
         close_streamfile(tagFile);
+        last_tags.loaded = 1;
     }
 }
 
@@ -1529,16 +1534,17 @@ static int winampGetExtendedFileInfo_common(in_char* filename, char *metadata, c
     int i, tag_found;
     int max_len;
 
+    /* load list current tags, if necessary */
+    load_tagfile_info(filename);
+    if (!last_tags.loaded) /* tagfile not found, fail so default get_title takes over */
+        goto fail;
+
     /* always called (value in ms), must return ok so other tags get called */
     if (strcasecmp(metadata, "length") == 0) {
         strcpy(ret, "0");//todo should export but shows GetFileInfo's ms if not provided
         return 1;
     }
 
-    /* load list current tags, if necessary */
-    load_tagfile_info(filename);
-
-
 #if 0
     /* special case to fill WA5's unified dialog */
     if (strcasecmp(metadata, "formatinformation") == 0) {