diff options
author | 2009-12-27 21:39:22 +0100 | |
---|---|---|
committer | 2009-12-27 21:39:22 +0100 | |
commit | 670ad41967e397f7d591b96abf90f092180b7783 (patch) | |
tree | c8d55c243cb618752764f88c822624cbf7b0b891 /dumb/dumb-kode54/src | |
parent | 84d1d8c7d473e67b056ed7fc1fcd99321036fedf (diff) | |
parent | dc9958e41747704a8095f5cdaae5c99fd0b0f2d1 (diff) |
Merge branch 'guiplug'
Conflicts:
main.c
plugins/vorbis/vorbis.c
Diffstat (limited to 'dumb/dumb-kode54/src')
-rw-r--r-- | dumb/dumb-kode54/src/it/reads3m.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/dumb/dumb-kode54/src/it/reads3m.c b/dumb/dumb-kode54/src/it/reads3m.c index 283becb1..0dac8331 100644 --- a/dumb/dumb-kode54/src/it/reads3m.c +++ b/dumb/dumb-kode54/src/it/reads3m.c @@ -61,7 +61,7 @@ static int it_s3m_read_sample_header(IT_SAMPLE *sample, long *offset, unsigned c sample->name[28] = 0;
dumbfile_skip(f, 4);
sample->flags &= ~IT_SAMPLE_EXISTS;
- return dumbfile_error(f);
+ return -1; // return error so that another plugin could pick that file up
}
*offset = dumbfile_getc(f) << 20;
@@ -730,12 +730,15 @@ static DUMB_IT_SIGDATA *it_s3m_load_sigdata(DUMBFILE *f, int * cwtv) break;
case S3M_COMPONENT_SAMPLE:
- if (it_s3m_read_sample_header(&sigdata->sample[component[n].n], &offset, &sample_pack[component[n].n], *cwtv, f)) {
+ {
+ int err = it_s3m_read_sample_header(&sigdata->sample[component[n].n], &offset, &sample_pack[component[n].n], *cwtv, f);
+ if (err) {
free(buffer);
free(component);
_dumb_it_unload_sigdata(sigdata);
return NULL;
}
+ }
if (sigdata->sample[component[n].n].flags & IT_SAMPLE_EXISTS) {
short *sample;
|