From: ThorstenB <brehmt@gmail.com>
Date: Sat, 13 Oct 2012 10:42:48 +0000 (+0200)
Subject: Drop sorting of Nasal scripts.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=60eaa22fdaa8bc6f113d596aa433c9a4e5d77382;p=flightgear.git

Drop sorting of Nasal scripts.
simgear::Dir now always provides results in a deterministic order.
---

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 <sys/stat.h>
 #include <fstream>
 #include <sstream>
-#include <algorithm> // for std::sort
 
 #include <simgear/nasal/nasal.h>
 #include <simgear/props/props.hxx>
@@ -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<scripts.size(); ++i) {
       SGPath fullpath(scripts[i]);
       SGPath file = fullpath.file();