From a116306eeb55969c52247f7fac9a9d8da0ecb3a0 Mon Sep 17 00:00:00 2001 From: Pieter Hulshoff Date: Fri, 20 Jan 2017 15:01:58 +0100 Subject: [PATCH] Collection's settings.conf file is no longer required. Since the introduction of merged collections and menu based collections, the requirement for the presence of a settings.conf file has become obsolete. --- RetroFE/Source/Main.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/RetroFE/Source/Main.cpp b/RetroFE/Source/Main.cpp index 50b1012..1dd8ce3 100644 --- a/RetroFE/Source/Main.cpp +++ b/RetroFE/Source/Main.cpp @@ -187,11 +187,9 @@ bool ImportConfiguration(Configuration *c) std::string settingsFile = Utils::combinePath(collectionsPath, collection, "settings.conf"); - if(!c->import(collection, prefix, settingsFile)) + if(!c->import(collection, prefix, settingsFile, false)) { - Logger::write(Logger::ZONE_ERROR, "RetroFE", "Could not import \"" + settingsFile + "\""); - closedir(dp); - return false; + Logger::write(Logger::ZONE_INFO, "RetroFE", "Could not import \"" + settingsFile + "\""); } }