From 2d584d7e8aaeacbcb1036bae5c8deca9b810fe60 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Sat, 17 Jul 2010 19:51:30 -0600 Subject: Fix handing configuration files that don't exist yet Reviewed-by: trapdoor --- src/configuration.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/configuration.cpp b/src/configuration.cpp index cd31fed7..d8b11034 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -141,17 +141,17 @@ void Configuration::init(const std::string &filename, bool useResManager) { XML::Document doc(filename, useResManager); + if (useResManager) + mConfigPath = "PhysFS://" + filename; + else + mConfigPath = filename; + if (!doc.rootNode()) { logger->log("Couldn't open configuration file: %s", filename.c_str()); return; } - if (useResManager) - mConfigPath = "PhysFS://" + filename; - else - mConfigPath = filename; - xmlNodePtr rootNode = doc.rootNode(); if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "configuration")) -- cgit v1.2.3-60-g2f50