Core/Chat: Always save channel info to database on shutdown if persistence is enabled.

(cherry picked from commit 2d74652b5bfb4455791ff872fac13fb0f6bcc02a)

2 files changed, 3 insertions, 3 deletions

diff --git a/src/server/game/Chat/Channels/ChannelMgr.cpp b/src/server/game/Chat/Channels/ChannelMgr.cpp
index 83130a8841c..84b43888866 100644
--- a/src/server/game/Chat/Channels/ChannelMgr.cpp
+++ b/src/server/game/Chat/Channels/ChannelMgr.cpp
@@ -63,7 +63,7 @@ ChannelMgr::~ChannelMgr()
     do
     {
         Field* fields = result->Fetch();
-        std::string dbName = fields[0].GetString(); // may be different - channel names are case insensitive
+        std::string dbName = fields[0].GetString();
         uint32 team = fields[1].GetUInt32();
         bool dbAnnounce = fields[2].GetBool();
         bool dbOwnership = fields[3].GetBool();
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 1eee1879ebc..b002ec150dd 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -2493,7 +2493,7 @@ void World::Update(uint32 diff)
         sWhoListStorageMgr->Update();
     }
 
-    if (m_timers[WUPDATE_CHANNEL_SAVE].Passed())
+    if (IsStopped() || m_timers[WUPDATE_CHANNEL_SAVE].Passed())
     {
         m_timers[WUPDATE_CHANNEL_SAVE].Reset();
 
@@ -3223,7 +3223,7 @@ void World::ShutdownMsg(bool show, Player* player, const std::string& reason)
 /// Cancel a planned server shutdown
 uint32 World::ShutdownCancel()
 {
-    // nothing cancel or too later
+    // nothing cancel or too late
     if (!m_ShutdownTimer || m_stopEvent)
         return 0;