Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 22:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix the crash from writing files when the gamelist.xml contains games that

Browse source 
do not exist on the filesystem.
Write that ES has cleanly shut down to the log file instead of standard
output.
This commit is contained in:
Aloshi 2014-01-30 17:19:32 -06:00
parent ac57e111d2
commit 5c12395442
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/XMLReader.cpp
View file

@ -281,9 +281,9 @@ void updateGamelist(SystemData* system)
continue; continue;
} }
boost::filesystem::path nodePath(pathNode.text().get()); fs::path nodePath(pathNode.text().get());
boost::filesystem::path gamePath((*fit)->getPath()); fs::path gamePath((*fit)->getPath());
if(fs::canonical(nodePath) == fs::canonical(gamePath)) if(nodePath == gamePath || (fs::exists(nodePath) && fs::exists(gamePath) && fs::equivalent(nodePath, gamePath)))
{ {
// found it // found it
root.remove_child(fileNode); root.remove_child(fileNode);

2
src/main.cpp
View file

@ -249,7 +249,7 @@ int main(int argc, char* argv[])
window.deinit(); window.deinit();
SystemData::deleteSystems(); SystemData::deleteSystems();
std::cout << "EmulationStation cleanly shutting down...\n"; LOG(LogInfo) << "EmulationStation cleanly shutting down.";
return 0; return 0;
} }