From fa60ccdd52d7c71413087c3a2130c3105dea43f4 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 26 Sep 2015 14:26:13 -0400
Subject: [PATCH] Don't find scripts from the last loaded world's raw/scripts
 folder

---
 library/Core.cpp           | 2 +-
 scripts/3rdparty/dscorbett | 2 +-
 scripts/3rdparty/lethosor  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/Core.cpp b/library/Core.cpp
index bd34f2f07..c1c1c850a 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -469,7 +469,7 @@ void Core::getScriptPaths(std::vector<std::string> *dest)
     string df_path = this->p->getPath();
     for (auto it = script_paths[0].begin(); it != script_paths[0].end(); ++it)
         dest->push_back(*it);
-    if (df::global::world) {
+    if (df::global::world && isWorldLoaded()) {
         string save = World::ReadWorldFolder();
         if (save.size())
             dest->push_back(df_path + "/data/save/" + save + "/raw/scripts");
diff --git a/scripts/3rdparty/dscorbett b/scripts/3rdparty/dscorbett
index 544f890a6..412f2b283 160000
--- a/scripts/3rdparty/dscorbett
+++ b/scripts/3rdparty/dscorbett
@@ -1 +1 @@
-Subproject commit 544f890a62622e2c6188991afe61fdf3c0513227
+Subproject commit 412f2b283d33a4c63a5bbcfab9c015c488ab6d5d
diff --git a/scripts/3rdparty/lethosor b/scripts/3rdparty/lethosor
index e3666a738..491c4614f 160000
--- a/scripts/3rdparty/lethosor
+++ b/scripts/3rdparty/lethosor
@@ -1 +1 @@
-Subproject commit e3666a7385ca00565b95f3d7c6d41f6e7955816f
+Subproject commit 491c4614fb9b83015815a5784a2ba53ac3f8430f