From a3d51d25fdc5b5549d0b94a03e7f337ba923f220 Mon Sep 17 00:00:00 2001 From: Toni Riikonen Date: Tue, 23 Sep 2025 23:10:26 +0300 Subject: [PATCH] Fixed merge issue --- src/floppy/fdd_audio.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/floppy/fdd_audio.c b/src/floppy/fdd_audio.c index 84fcee5a6..04ae9ba68 100644 --- a/src/floppy/fdd_audio.c +++ b/src/floppy/fdd_audio.c @@ -180,30 +180,13 @@ load_wav(const char *filename, int *sample_count) if ((filename == NULL) || (strlen(filename) == 0)) return NULL; - } if (strstr(filename, "..") != NULL) return NULL; - } f = rom_fopen(filename, "rb"); if (f == NULL) return NULL; - } - } - - path_append_filename(full_path, exe_path, "roms"); - path_append_filename(full_path, full_path, "samples"); - path_append_filename(full_path, full_path, "fdd"); - path_append_filename(full_path, full_path, filename); - f = fopen(full_path, "rb"); - if (!f) { - path_append_filename(full_path, full_path, "samples"); - path_append_filename(full_path, exe_path, filename); - f = fopen(full_path, "rb"); - if (!f) - return NULL; - } wav_header_t hdr; if (fread(&hdr, sizeof(hdr), 1, f) != 1) {