From 54e733a59cdcb8c0682587122a958e19669c87a3 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 16 Sep 2017 21:33:37 +0300 Subject: Restore old way for music termination on exit. --- src/progs/dyecmd/client.cpp | 4 ++-- src/progs/manaplus/client.cpp | 6 +++--- 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"); -- cgit v1.2.3-70-g09d2