From 69f995bb5124c19746ff026f4e64c7398611e9f0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 15 Sep 2017 00:17:44 +0300 Subject: Fix termination audio on exit. --- src/progs/dyecmd/client.cpp | 6 +++--- src/progs/manaplus/client.cpp | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'src/progs') diff --git a/src/progs/dyecmd/client.cpp b/src/progs/dyecmd/client.cpp index 643ffdb30..a097e0f06 100644 --- a/src/progs/dyecmd/client.cpp +++ b/src/progs/dyecmd/client.cpp @@ -449,8 +449,7 @@ void Client::gameClear() if (logger != nullptr) logger->log1("Quitting5"); - // Shutdown sound - soundManager.close(); + soundManager.shutdown(); if (logger != nullptr) logger->log1("Quitting6"); @@ -458,6 +457,8 @@ void Client::gameClear() touchManager.clear(); ResourceManager::deleteInstance(); + soundManager.close(); + if (logger != nullptr) logger->log1("Quitting8"); @@ -473,7 +474,6 @@ void Client::gameClear() if (logger != nullptr) logger->log1("Quitting10"); - soundManager.shutdown(); touchManager.shutdown(); #ifdef DEBUG_CONFIG diff --git a/src/progs/manaplus/client.cpp b/src/progs/manaplus/client.cpp index f9575e8e4..c008cc6af 100644 --- a/src/progs/manaplus/client.cpp +++ b/src/progs/manaplus/client.cpp @@ -691,8 +691,7 @@ void Client::gameClear() BeingInfo::clear(); - // Shutdown sound - soundManager.close(); + soundManager.shutdown(); if (logger != nullptr) logger->log1("Quitting6"); @@ -701,6 +700,9 @@ void Client::gameClear() ResourceManager::deleteInstance(); + // Shutdown sound + soundManager.close(); + if (logger != nullptr) logger->log1("Quitting8"); @@ -716,7 +718,6 @@ void Client::gameClear() if (logger != nullptr) logger->log1("Quitting10"); - soundManager.shutdown(); touchManager.shutdown(); #ifdef DEBUG_CONFIG -- cgit v1.2.3-70-g09d2