diff options
| author | randomdan <randomdan@localhost> | 2012-03-13 23:45:04 +0000 |
|---|---|---|
| committer | randomdan <randomdan@localhost> | 2012-03-13 23:45:04 +0000 |
| commit | 793d8ff57a327dacac0f4126aa26389af7db45e1 (patch) | |
| tree | 5f61080288b5c1a886204b6113209a32b52001ff | |
| parent | Much improved flexibility around partial/parameterised SQL merges (diff) | |
| download | project2-793d8ff57a327dacac0f4126aa26389af7db45e1.tar.bz2 project2-793d8ff57a327dacac0f4126aa26389af7db45e1.tar.xz project2-793d8ff57a327dacac0f4126aa26389af7db45e1.zip | |
Fix error persisting when loadComplete fails
| -rw-r--r-- | project2/common/scriptLoader.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/project2/common/scriptLoader.cpp b/project2/common/scriptLoader.cpp index 9b1a36d..8237163 100644 --- a/project2/common/scriptLoader.cpp +++ b/project2/common/scriptLoader.cpp @@ -1,4 +1,5 @@ #include <pch.hpp> +#include "scopeObject.h" #include "scriptLoader.h" #include "scriptStorage.h" #include "logger.h" @@ -138,10 +139,10 @@ LoaderBase::collectAll(const CommonObjects * co, bool childrenOnly, ScriptNodePt targets.erase(i); } if (co) { + ScopeObject clr(boost::bind(&std::set<SourceObjectPtr>::clear, &loadedObjects)); BOOST_FOREACH(SourceObjectPtr o, loadedObjects) { o->loadComplete(co); } - loadedObjects.clear(); } } |