From 156ad80460a4eb140e621ecc5f41a743e46f95d8 Mon Sep 17 00:00:00 2001 From: w4123 <1840686745@qq.com> Date: Sun, 9 Aug 2020 16:26:27 +0800 Subject: [PATCH] Fix bug --- Dice/DiceConsole.cpp | 2 +- Dice/DiceSession.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dice/DiceConsole.cpp b/Dice/DiceConsole.cpp index bf1192f2..1756415a 100644 --- a/Dice/DiceConsole.cpp +++ b/Dice/DiceConsole.cpp @@ -182,7 +182,7 @@ void Console::loadNotice() if (loadFile(DiceDir + "\\conf\\NoticeList.txt", NoticeList) < 1) { std::set sChat; - if (loadFile(static_cast(getAppDirectory()) + "MonitorList.RDconf", sChat) > 0) + if (loadFile(std::string(getAppDirectory()) + "MonitorList.RDconf", sChat) > 0) for (const auto& it : sChat) { console.setNotice(it, 0b100000); diff --git a/Dice/DiceSession.cpp b/Dice/DiceSession.cpp index bde8790d..3f006d2b 100644 --- a/Dice/DiceSession.cpp +++ b/Dice/DiceSession.cpp @@ -352,7 +352,7 @@ int DiceTableMaster::load() for (nlohmann::json::iterator itTable = j["tables"].begin(); itTable != j["tables"].end(); ++itTable) { string strTable = UTF8toGBK(itTable.key()); - for (nlohmann::json::iterator itItem = itTable.value().begin(); itItem != j.end(); ++itItem) + for (nlohmann::json::iterator itItem = itTable.value().begin(); itItem != itTable.value().end(); ++itItem) { pSession->mTable[strTable].emplace(UTF8toGBK(itItem.key()), itItem.value()); }