diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2014-10-07 22:15:40 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2014-10-07 22:15:40 +0200 |
| commit | 5274acd624c3a5ad60592cee2ebc869b10a96fda (patch) | |
| tree | 04836157b8c3aa9553d5e67e8ed248220ff1661a /src/sound | |
| parent | 3ef2f976df56817d2a23d4fe88a1917798beaacd (diff) | |
| parent | 2770ee8927cb91419b1918f46228435026790cf6 (diff) | |
| download | colobot-5274acd624c3a5ad60592cee2ebc869b10a96fda.tar.gz colobot-5274acd624c3a5ad60592cee2ebc869b10a96fda.tar.bz2 colobot-5274acd624c3a5ad60592cee2ebc869b10a96fda.zip | |
Merge with dev
Diffstat (limited to 'src/sound')
| -rw-r--r-- | src/sound/oalsound/alsound.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/sound/oalsound/alsound.cpp b/src/sound/oalsound/alsound.cpp index 54c94a5..bed43cc 100644 --- a/src/sound/oalsound/alsound.cpp +++ b/src/sound/oalsound/alsound.cpp @@ -56,20 +56,14 @@ void ALSound::CleanUp() delete channel.second; } - if (m_currentMusic) - { - delete m_currentMusic; - } - + delete m_currentMusic; + for (auto item : m_oldMusic) { delete item.music; } - - if (m_previousMusic.music) - { - delete m_previousMusic.music; - } + + delete m_previousMusic.music; for (auto item : m_sounds) { |