[Scummvm-git-logs] scummvm master -> 9d62f13e3a36e079e9f882aa4062ee6ad69bc181

[bgK]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9d62f13e3a BASE: Fix a segfault when mass detector encounters an empty directory


Commit: 9d62f13e3a36e079e9f882aa4062ee6ad69bc181
    https://github.com/scummvm/scummvm/commit/9d62f13e3a36e079e9f882aa4062ee6ad69bc181
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2018-06-17T18:09:40+02:00

Commit Message:
BASE: Fix a segfault when mass detector encounters an empty directory

Was introduced in the recent detection rework.

Changed paths:
    base/plugins.cpp


diff --git a/base/plugins.cpp b/base/plugins.cpp
index 023f2f3..f6bbeac 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -515,7 +515,6 @@ PlainGameDescriptor EngineManager::findGameInLoadedPlugins(const Common::String
 
 DetectionResults EngineManager::detectGames(const Common::FSList &fslist) const {
 	DetectedGames candidates;
-	Common::String path = fslist.begin()->getParent().getPath();
 	PluginList plugins;
 	PluginList::const_iterator iter;
 	PluginManager::instance().loadFirstPlugin();
@@ -529,7 +528,7 @@ DetectionResults EngineManager::detectGames(const Common::FSList &fslist) const
 
 			for (uint i = 0; i < engineCandidates.size(); i++) {
 				engineCandidates[i].engineName = metaEngine.getName();
-				engineCandidates[i].path = path;
+				engineCandidates[i].path = fslist.begin()->getParent().getPath();
 				candidates.push_back(engineCandidates[i]);
 			}