From eeea454bff0cfcda495c20029a0246f63f14393e Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Tue, 27 Jan 2015 02:07:41 -0500
Subject: [PATCH] Fix missing map_meta.txt error when creating new worlds
A missing map_meta.txt should be treated simply as if there were a blank file.
---
src/map.cpp | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/map.cpp b/src/map.cpp
index bd3636c7b..d8f018742 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -3109,7 +3109,7 @@ void ServerMap::saveMapMeta()
createDirs(m_savedir);
- std::string fullpath = m_savedir + DIR_DELIM + "map_meta.txt";
+ std::string fullpath = m_savedir + DIR_DELIM "map_meta.txt";
std::ostringstream ss(std::ios_base::binary);
Settings params;
@@ -3133,19 +3133,21 @@ void ServerMap::loadMapMeta()
{
DSTACK(__FUNCTION_NAME);
+ Settings params;
std::string fullpath = m_savedir + DIR_DELIM "map_meta.txt";
- std::ifstream is(fullpath.c_str(), std::ios_base::binary);
- if (!is.good()) {
- errorstream << "ServerMap::loadMapMeta(): "
- << "could not open" << fullpath << std::endl;
- throw FileNotGoodException("Cannot open map metadata");
- }
- Settings params;
+ if (fs::PathExists(fullpath)) {
+ std::ifstream is(fullpath.c_str(), std::ios_base::binary);
+ if (!is.good()) {
+ errorstream << "ServerMap::loadMapMeta(): "
+ "could not open " << fullpath << std::endl;
+ throw FileNotGoodException("Cannot open map metadata");
+ }
- if (!params.parseConfigLines(is, "[end_of_params]")) {
- throw SerializationError("ServerMap::loadMapMeta(): "
+ if (!params.parseConfigLines(is, "[end_of_params]")) {
+ throw SerializationError("ServerMap::loadMapMeta(): "
"[end_of_params] not found!");
+ }
}
m_emerge->loadParamsFromSettings(¶ms);
--
GitLab