From 3ff2c33d3cf993d9b863492ebaff3c5058be7593 Mon Sep 17 00:00:00 2001 From: Nunuhara Cabbage Date: Sun, 12 Feb 2023 19:49:28 -0800 Subject: [PATCH] Fix crash due to gap in mixer list Fix a crash that occurs during startup of Oyako Rankan due to a gap in the "VolumeValancer" list in AliceStart.ini --- src/system4.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/system4.c b/src/system4.c index 8589dc9..08cce96 100644 --- a/src/system4.c +++ b/src/system4.c @@ -100,10 +100,9 @@ static void read_mixer_channels(struct ini_entry *entry) config.mixer_volumes = xcalloc(entry->value.list_size, sizeof(int)); for (size_t i = 0; i < entry->value.list_size; i++) { if (entry->value.list[i].type == INI_NULL) { - WARNING("No name given for VolumeValancer[%d]", i); - continue; - } - if (entry->value.list[i].type == INI_STRING) { + config.mixer_channels[i] = strdup("Unnamed"); + config.mixer_volumes[i] = 0; + } else if (entry->value.list[i].type == INI_STRING) { config.mixer_channels[i] = strdup(entry->value.list[i].s->text); // XXX: assumes default_volume was already initialized config.mixer_volumes[i] = config.default_volume;