summaryrefslogtreecommitdiff
path: root/src/progs
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-09-16 21:33:37 +0300
committerAndrei Karas <akaras@inbox.ru>2017-09-16 21:33:37 +0300
commit54e733a59cdcb8c0682587122a958e19669c87a3 (patch)
treec4c12b8ed90eecf4f9fdc1abcee358dad07979a3 /src/progs
parent4c1c26149c2e459867567b74a5fc9a0a1231f306 (diff)
downloadplus-54e733a59cdcb8c0682587122a958e19669c87a3.tar.gz
plus-54e733a59cdcb8c0682587122a958e19669c87a3.tar.bz2
plus-54e733a59cdcb8c0682587122a958e19669c87a3.tar.xz
plus-54e733a59cdcb8c0682587122a958e19669c87a3.zip
Restore old way for music termination on exit.v1.7.9.16
Diffstat (limited to 'src/progs')
-rw-r--r--src/progs/dyecmd/client.cpp4
-rw-r--r--src/progs/manaplus/client.cpp6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/progs/dyecmd/client.cpp b/src/progs/dyecmd/client.cpp
index a097e0f06..30451dbf5 100644
--- a/src/progs/dyecmd/client.cpp
+++ b/src/progs/dyecmd/client.cpp
@@ -449,7 +449,7 @@ void Client::gameClear()
if (logger != nullptr)
logger->log1("Quitting5");
- soundManager.shutdown();
+ soundManager.close();
if (logger != nullptr)
logger->log1("Quitting6");
@@ -457,7 +457,7 @@ void Client::gameClear()
touchManager.clear();
ResourceManager::deleteInstance();
- soundManager.close();
+ soundManager.shutdown();
if (logger != nullptr)
logger->log1("Quitting8");
diff --git a/src/progs/manaplus/client.cpp b/src/progs/manaplus/client.cpp
index c008cc6af..4cf9923ee 100644
--- a/src/progs/manaplus/client.cpp
+++ b/src/progs/manaplus/client.cpp
@@ -691,7 +691,8 @@ void Client::gameClear()
BeingInfo::clear();
- soundManager.shutdown();
+ // Shutdown sound
+ soundManager.close();
if (logger != nullptr)
logger->log1("Quitting6");
@@ -700,8 +701,7 @@ void Client::gameClear()
ResourceManager::deleteInstance();
- // Shutdown sound
- soundManager.close();
+ soundManager.shutdown();
if (logger != nullptr)
logger->log1("Quitting8");