diff options
| -rw-r--r-- | apps/samples/put-that-there/put-that-there.scxml | 2 | ||||
| -rw-r--r-- | apps/uscxml-browser.cpp | 2 | ||||
| -rw-r--r-- | contrib/ctest/hosts/debian64.ctest | 2 | ||||
| -rw-r--r-- | contrib/prebuilt/README.md | 3 | ||||
| -rw-r--r-- | src/uscxml/Factory.cpp | 4 |
5 files changed, 4 insertions, 9 deletions
diff --git a/apps/samples/put-that-there/put-that-there.scxml b/apps/samples/put-that-there/put-that-there.scxml index fee9f39..b608972 100644 --- a/apps/samples/put-that-there/put-that-there.scxml +++ b/apps/samples/put-that-there/put-that-there.scxml @@ -13,7 +13,7 @@ <scenegraph:box x="1" y="2" z="3" color="red" /> </scenegraph:translation> <scenegraph:translation x="0" y="5" z="0"> - <scenegraph:capsule radius="1" height="2" materialcolor="blue" transparency="0.5"/> + <scenegraph:capsule radius="1" height="2" materialcolor="blue"/> </scenegraph:translation> <scenegraph:translation x="0" y="0" z="5"> <scenegraph:cone radius="1" height="2" color="lightblue" /> diff --git a/apps/uscxml-browser.cpp b/apps/uscxml-browser.cpp index 3cb1138..bba1bc0 100644 --- a/apps/uscxml-browser.cpp +++ b/apps/uscxml-browser.cpp @@ -185,7 +185,7 @@ int main(int argc, char** argv) { interpreterIter = interpreters.begin(); while(interpreterIter != interpreters.end()) { stillRunning = interpreterIter->runOnMainThread(25); - if (stillRunning) { + if (!stillRunning) { interpreters.erase(interpreterIter++); } else { interpreterIter++; diff --git a/contrib/ctest/hosts/debian64.ctest b/contrib/ctest/hosts/debian64.ctest index 06fb6bd..325c050 100644 --- a/contrib/ctest/hosts/debian64.ctest +++ b/contrib/ctest/hosts/debian64.ctest @@ -3,7 +3,7 @@ set(CTEST_SITE "epikur.local") set(CTEST_BUILD_CONFIGURATION "Debug") set(RETAIN_BUILD_DIR OFF) -set(REMOVE_PREBUILDS ON) +set(REMOVE_PREBUILDS OFF) set(CTEST_BUILD_NAME "darwin-x86_64 llvm") include("tests/ecma.ctest") include("common.ctest.inc") diff --git a/contrib/prebuilt/README.md b/contrib/prebuilt/README.md deleted file mode 100644 index 81196cd..0000000 --- a/contrib/prebuilt/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Prebuilt Libraries - -This directory will be populated by prebuilt libraries at configure time from CMake.
\ No newline at end of file diff --git a/src/uscxml/Factory.cpp b/src/uscxml/Factory.cpp index f75cdd3..ccbb283 100644 --- a/src/uscxml/Factory.cpp +++ b/src/uscxml/Factory.cpp @@ -152,9 +152,7 @@ Factory::Factory() { registerDataModel(dataModel); } } else { - LOG(ERROR) << "No path to plugins known, export USCXML_PLUGIN_PATH or pass path as parameter"; - Event e; - throw e; + LOG(WARNING) << "No path to plugins known, export USCXML_PLUGIN_PATH or pass path as parameter"; } #else #if 1 |