Merge branch 'main' into fix-market-offer-fee-check

opentibiabr · Jan 15, 2025 · ada9f22 · ada9f22
2 parents a0c82e7 + 8e1fd02
commit ada9f22
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/database/database.cpp b/src/database/database.cpp
@@ -82,8 +82,8 @@ void Database::createDatabaseBackup(bool compress) const {
 	std::ofstream configFile(tempConfigFile);
 	if (configFile.is_open()) {
 		configFile << "[client]\n";
-		configFile << "user=" << g_configManager().getString(MYSQL_USER) << "\n";
-		configFile << "password=" << g_configManager().getString(MYSQL_PASS) << "\n";
+		configFile << "user=\"" << g_configManager().getString(MYSQL_USER) << "\"\n";
+		configFile << "password=\"" << g_configManager().getString(MYSQL_PASS) << "\"\n";
 		configFile << "host=" << g_configManager().getString(MYSQL_HOST) << "\n";
 		configFile << "port=" << g_configManager().getNumber(SQL_PORT) << "\n";
 		configFile.close();

diff --git a/src/game/game.cpp b/src/game/game.cpp
@@ -10998,7 +10998,7 @@ void Game::playerCyclopediaHousesByTown(uint32_t playerId, const std::string &to
 			const auto &house = it.second;
 			const auto &town = g_game().map.towns.getTown(house->getTownId());
 			if (!town) {
-				return;
+				continue;
 			}
 
 			const std::string &houseTown = town->getName();