diff --git a/pcsx2/SPU2/Linux/CfgHelpers.cpp b/pcsx2/SPU2/Linux/CfgHelpers.cpp index 7565980c24..1885c542d9 100644 --- a/pcsx2/SPU2/Linux/CfgHelpers.cpp +++ b/pcsx2/SPU2/Linux/CfgHelpers.cpp @@ -23,9 +23,9 @@ bool pathSet = false; void initIni() { - if(!pathSet) + if (!pathSet) { - path = GetSettingsFolder().Combine( path ).GetFullPath(); + path = GetSettingsFolder().Combine(path).GetFullPath(); pathSet = true; } if (spuConfig == nullptr) diff --git a/pcsx2/SPU2/Linux/Config.cpp b/pcsx2/SPU2/Linux/Config.cpp index 2cfbc84dee..43c99a259e 100644 --- a/pcsx2/SPU2/Linux/Config.cpp +++ b/pcsx2/SPU2/Linux/Config.cpp @@ -82,10 +82,7 @@ void ReadSettings() // For some reason this can be called before we know what ini file we're writing to. // Lets not try to read it if that happens. if (!pathSet) - { - FileLog("Read called without the path set.\n"); - return; - } + initIni(); Interpolation = CfgReadInt(L"MIXING", L"Interpolation", 4); EffectsDisabled = CfgReadBool(L"MIXING", L"Disable_Effects", false); diff --git a/pcsx2/SPU2/SndOut.cpp b/pcsx2/SPU2/SndOut.cpp index 4a1b70cd8e..f454b3b92d 100644 --- a/pcsx2/SPU2/SndOut.cpp +++ b/pcsx2/SPU2/SndOut.cpp @@ -86,7 +86,7 @@ SndOutModule* mods[] = XAudio2Out, WaveOut, #endif -#if defined(SPU2X_PORTAUDIO) +#if defined(SPU2X_PORTAUDIO) PortaudioOut, #endif #if defined(__linux__) /* && defined(__ALSA__)*/ diff --git a/pcsx2/SPU2/Windows/Config.cpp b/pcsx2/SPU2/Windows/Config.cpp index 4bdb8f9d03..7621a01e75 100644 --- a/pcsx2/SPU2/Windows/Config.cpp +++ b/pcsx2/SPU2/Windows/Config.cpp @@ -193,7 +193,7 @@ void WriteSettings() CfgWriteInt(L"DSP PLUGIN", L"ModuleNum", dspPluginModule); CfgWriteBool(L"DSP PLUGIN", L"Enabled", dspPluginEnabled); - PortaudioOut->WriteSettings(); + PortaudioOut->WriteSettings(); SoundtouchCfg::WriteSettings(); DebugConfig::WriteSettings(); } @@ -206,7 +206,7 @@ void CheckOutputModule(HWND window) mods[OutputModule] == WaveOut; const bool AudioExpansion = - mods[OutputModule] == XAudio2Out || + mods[OutputModule] == XAudio2Out || mods[OutputModule] == PortaudioOut; EnableWindow(GetDlgItem(window, IDC_OUTCONF), IsConfigurable); diff --git a/pcsx2/SPU2/spu2.cpp b/pcsx2/SPU2/spu2.cpp index 04983223da..4bc9b38d2d 100644 --- a/pcsx2/SPU2/spu2.cpp +++ b/pcsx2/SPU2/spu2.cpp @@ -19,6 +19,7 @@ #include "Dma.h" #ifdef __linux__ #include "Linux/Dialogs.h" +#include "Linux/Config.h" #elif defined(_WIN32) #include "Windows/Dialogs.h" #endif