From 97089a7683f474c458b05ccc4c4a52e75747c2f3 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Sat, 16 Oct 2010 20:11:26 +0000 Subject: [PATCH] Don't destroy the progress dialog when audio loading is cancelled as it's destroyed automatically Originally committed to SVN as r4811. --- aegisub/src/audio_provider_hd.cpp | 2 +- aegisub/src/audio_provider_ram.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aegisub/src/audio_provider_hd.cpp b/aegisub/src/audio_provider_hd.cpp index a40578e9c..93a67a4e7 100644 --- a/aegisub/src/audio_provider_hd.cpp +++ b/aegisub/src/audio_provider_hd.cpp @@ -93,12 +93,12 @@ HDAudioProvider::HDAudioProvider(AudioProvider *src) { file_cache.Seek(0); // Finish - progress->Destroy(); if (canceled) { file_cache.Close(); delete[] data; throw agi::UserCancelException("Audio loading cancelled by user"); } + progress->Destroy(); } /// @brief Destructor diff --git a/aegisub/src/audio_provider_ram.cpp b/aegisub/src/audio_provider_ram.cpp index 4f156ab30..ca468e301 100644 --- a/aegisub/src/audio_provider_ram.cpp +++ b/aegisub/src/audio_provider_ram.cpp @@ -99,11 +99,11 @@ RAMAudioProvider::RAMAudioProvider(AudioProvider *src) { } // Clean up progress - progress->Destroy(); if (canceled) { Clear(); throw agi::UserCancelException("Audio loading cancelled by user"); } + progress->Destroy(); } /// @brief Destructor