Merge pull request #4523 from RisingFog/overwrite_audio_warning

Display warning when dumping audio if file exists

1 files changed, 24 insertions, 8 deletions

diff --git a/Source/Core/AudioCommon/Mixer.cpp b/Source/Core/AudioCommon/Mixer.cpp
index 1246cfb489..de5a4fdde8 100644
--- a/Source/Core/AudioCommon/Mixer.cpp
+++ b/Source/Core/AudioCommon/Mixer.cpp
@@ -214,10 +214,18 @@ void CMixer::StartLogDTKAudio(const std::string& filename)
 {
   if (!m_log_dtk_audio)
   {
-    m_log_dtk_audio = true;
-    m_wave_writer_dtk.Start(filename, m_streaming_mixer.GetInputSampleRate());
-    m_wave_writer_dtk.SetSkipSilence(false);
-    NOTICE_LOG(AUDIO, "Starting DTK Audio logging");
+    bool success = m_wave_writer_dtk.Start(filename, m_streaming_mixer.GetInputSampleRate());
+    if (success)
+    {
+      m_log_dtk_audio = true;
+      m_wave_writer_dtk.SetSkipSilence(false);
+      NOTICE_LOG(AUDIO, "Starting DTK Audio logging");
+    }
+    else
+    {
+      m_wave_writer_dtk.Stop();
+      NOTICE_LOG(AUDIO, "Unable to start DTK Audio logging");
+    }
   }
   else
   {
@@ -243,10 +251,18 @@ void CMixer::StartLogDSPAudio(const std::string& filename)
 {
   if (!m_log_dsp_audio)
   {
-    m_log_dsp_audio = true;
-    m_wave_writer_dsp.Start(filename, m_dma_mixer.GetInputSampleRate());
-    m_wave_writer_dsp.SetSkipSilence(false);
-    NOTICE_LOG(AUDIO, "Starting DSP Audio logging");
+    bool success = m_wave_writer_dsp.Start(filename, m_dma_mixer.GetInputSampleRate());
+    if (success)
+    {
+      m_log_dsp_audio = true;
+      m_wave_writer_dsp.SetSkipSilence(false);
+      NOTICE_LOG(AUDIO, "Starting DSP Audio logging");
+    }
+    else
+    {
+      m_wave_writer_dsp.Stop();
+      NOTICE_LOG(AUDIO, "Unable to start DSP Audio logging");
+    }
   }
   else
   {