From 60eaa22fdaa8bc6f113d596aa433c9a4e5d77382 Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Sat, 13 Oct 2012 12:42:48 +0200 Subject: [PATCH] Drop sorting of Nasal scripts. simgear::Dir now always provides results in a deterministic order. --- src/Scripting/NasalSys.cxx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Scripting/NasalSys.cxx b/src/Scripting/NasalSys.cxx index b38e0fbcd..9bb1966e7 100644 --- a/src/Scripting/NasalSys.cxx +++ b/src/Scripting/NasalSys.cxx @@ -13,7 +13,6 @@ #include #include #include -#include // for std::sort #include #include @@ -635,10 +634,8 @@ bool pathSortPredicate(const SGPath& p1, const SGPath& p2) void FGNasalSys::loadScriptDirectory(simgear::Dir nasalDir) { simgear::PathList scripts = nasalDir.children(simgear::Dir::TYPE_FILE, ".nas"); - // sort scripts, avoid loading sequence effects due to file system's - // random directory order - std::sort(scripts.begin(), scripts.end(), pathSortPredicate); - + // Note: simgear::Dir already reports file entries in a deterministic order, + // so a fixed loading sequence is guaranteed (same for every user) for (unsigned int i=0; i