mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-22 09:35:32 -07:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/master' into feature/recompiler_improvements

Browse Source
This commit is contained in:
OBattler
2025-12-21 23:09:31 +01:00
parent 6cb76a6dd0 a822628111
commit 2f294e1dde
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/floppy/fdd_audio.c
View File

@@ -517,10 +517,12 @@ load_profile_samples(int profile_id)
}
}
#ifdef ENABLE_FDD_LOG
/* Load BIOS vendor-specific POST mode seek samples if configured */
static const char *bios_names[] = {
"UNKNOWN", "AMI", "AWARD", "PHOENIX", "IBM", "COMPAQ", "OTHER"
};
#endif
for (int vendor = 1; vendor < BIOS_VENDOR_COUNT; vendor++) {
if (config->bios_post_seek_up[vendor][idx].filename[0]) {

4
src/qt/qt_settingsfloppycdrom.cpp
View File

@@ -149,7 +149,7 @@ SettingsFloppyCDROM::SettingsFloppyCDROM(QWidget *parent)
#ifndef DISABLE_FDD_AUDIO
// Get the profile name from the configuration system
const char *name = fdd_audio_get_profile_internal_name(prof);
const char *name = fdd_audio_get_profile_name(prof);
if (name) {
profName = QString(name);
} else {
@@ -449,7 +449,7 @@ SettingsFloppyCDROM::on_comboBoxFloppyAudio_activated(int)
#ifndef DISABLE_FDD_AUDIO
// Get the profile name from the configuration system
const char *name = fdd_audio_get_profile_internal_name(prof);
const char *name = fdd_audio_get_profile_name(prof);
if (name) {
profName = name;
} else {