summaryrefslogtreecommitdiff
path: root/src/progs
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-09-15 00:17:44 +0300
committerAndrei Karas <akaras@inbox.ru>2017-09-15 00:17:44 +0300
commit69f995bb5124c19746ff026f4e64c7398611e9f0 (patch)
tree3455a32540e5285595f2d88c30a4b82d3bbea77a /src/progs
parenta570c54e39c9a5f626db2453690cb7800d09cea3 (diff)
downloadmv-69f995bb5124c19746ff026f4e64c7398611e9f0.tar.gz
mv-69f995bb5124c19746ff026f4e64c7398611e9f0.tar.bz2
mv-69f995bb5124c19746ff026f4e64c7398611e9f0.tar.xz
mv-69f995bb5124c19746ff026f4e64c7398611e9f0.zip
Fix termination audio on exit.
Diffstat (limited to 'src/progs')
-rw-r--r--src/progs/dyecmd/client.cpp6
-rw-r--r--src/progs/manaplus/client.cpp7
2 files changed, 7 insertions, 6 deletions
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