mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Don't destroy the progress dialog when audio loading is cancelled as it's destroyed automatically

Browse source 
Originally committed to SVN as r4811.
This commit is contained in:
Thomas Goyne 2010-10-16 20:11:26 +00:00
parent 420f28adf8
commit 97089a7683
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
aegisub/src/audio_provider_hd.cpp
View file

@ -93,12 +93,12 @@ HDAudioProvider::HDAudioProvider(AudioProvider *src) {
file_cache.Seek(0); file_cache.Seek(0);
// Finish // Finish
progress->Destroy();
if (canceled) { if (canceled) {
file_cache.Close(); file_cache.Close();
delete[] data; delete[] data;
throw agi::UserCancelException("Audio loading cancelled by user"); throw agi::UserCancelException("Audio loading cancelled by user");
} }
progress->Destroy();
} }
/// @brief Destructor /// @brief Destructor

2
aegisub/src/audio_provider_ram.cpp
View file

@ -99,11 +99,11 @@ RAMAudioProvider::RAMAudioProvider(AudioProvider *src) {
} }
// Clean up progress // Clean up progress
progress->Destroy();
if (canceled) { if (canceled) {
Clear(); Clear();
throw agi::UserCancelException("Audio loading cancelled by user"); throw agi::UserCancelException("Audio loading cancelled by user");
} }
progress->Destroy();
} }
/// @brief Destructor /// @brief Destructor