minor fixes

vgmrips · Feb 10, 2019 · c40084e · c40084e
1 parent 9e62c1b
commit c40084e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/VGMPlay/VGMPlay.c b/VGMPlay/VGMPlay.c
@@ -658,7 +658,8 @@ char* FindFile(const char* FileName)
 	FullLen = PathLen + NameLen;
 	FullName = (char*)malloc(FullLen + 1);
 
-	while(CurPath >= AppPaths)
+	hFile = NULL;
+	for (; CurPath >= AppPaths; CurPath --)
 	{
 		strcpy(FullName, *CurPath);
 		strcat(FullName, FileName);
@@ -667,8 +668,6 @@ char* FindFile(const char* FileName)
 		hFile = fopen(FullName, "r");
 		if (hFile != NULL)
 			break;
-
-		CurPath --;
 	}
 
 	if (hFile != NULL)

diff --git a/VGMPlay/VGMPlayUI.c b/VGMPlay/VGMPlayUI.c
@@ -2304,12 +2304,13 @@ static void PlayVGM_UI(void)
 			printf(" seconds");
 			if (Show95Cmds && Last95Max != 0xFFFF)
 			{
+				UINT16 drumID = 1 + Last95Drum;	// 0-based -> 1-based, 0xFFFF = 0
 				if (Show95Cmds == 0x01)
-					printf("  %02X / %02hX", 1 + Last95Drum, Last95Max);
+					printf("  %02hX / %02hX", drumID , Last95Max);
 				else if (Show95Cmds == 0x02)
-					printf("  %02X / %02hX at %5u Hz", 1 + Last95Drum, Last95Max, Last95Freq);
+					printf("  %02hX / %02hX at %5u Hz", drumID, Last95Max, Last95Freq);
 				else if (Show95Cmds == 0x03)
-					printf("  %02X / %02hX at %4.1f KHz", 1 + Last95Drum, Last95Max,
+					printf("  %02hX / %02hX at %4.1f KHz", drumID, Last95Max,
 							Last95Freq / 1000.0);
 			}
 			//printf("  %u / %u", multipcm_get_channels(0, NULL), 28);

diff --git a/VGMPlay/chips/ymf278b.c b/VGMPlay/chips/ymf278b.c
@@ -1230,6 +1230,7 @@ void device_stop_ymf278b(UINT8 ChipID)
 
 	ymf262_shutdown(chip->fmchip);
 	free(chip->rom);	chip->rom = NULL;
+	free(chip->ram);	chip->ram = NULL;
 
 	return;
 }