From 086b9d404afae4d94780f1de4b33fe826d58fdbd Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Fri, 5 Jun 2015 08:59:08 -0700
Subject: [PATCH] fix return-type in lambda

---
 libraries/entities/src/EntityScriptingInterface.cpp |  5 ++++-
 libraries/shared/src/SettingInterface.cpp           | 12 ++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp
index f6f3b05c4d..e04bd977a2 100644
--- a/libraries/entities/src/EntityScriptingInterface.cpp
+++ b/libraries/entities/src/EntityScriptingInterface.cpp
@@ -487,7 +487,10 @@ QUuid EntityScriptingInterface::addAction(QString actionTypeString, QUuid entity
             if (actionType == ACTION_TYPE_NONE) {
                 return false;
             }
-            return simulation->actionFactory(actionType, actionID, entity, arguments);
+            if (simulation->actionFactory(actionType, actionID, entity, arguments)) {
+                return true;
+            }
+            return false;
         });
     if (success) {
         return actionID;
diff --git a/libraries/shared/src/SettingInterface.cpp b/libraries/shared/src/SettingInterface.cpp
index c14fd33565..b27d9089b5 100644
--- a/libraries/shared/src/SettingInterface.cpp
+++ b/libraries/shared/src/SettingInterface.cpp
@@ -39,12 +39,12 @@ namespace Setting {
     void init() {
         // read the ApplicationInfo.ini file for Name/Version/Domain information
         QSettings::setDefaultFormat(QSettings::IniFormat);
-        QSettings applicationInfo(PathUtils::resourcesPath() + "info/ApplicationInfo.ini", QSettings::IniFormat);
-        // set the associated application properties
-        applicationInfo.beginGroup("INFO");
-        QCoreApplication::setApplicationName(applicationInfo.value("name").toString());
-        QCoreApplication::setOrganizationName(applicationInfo.value("organizationName").toString());
-        QCoreApplication::setOrganizationDomain(applicationInfo.value("organizationDomain").toString());
+        // QSettings applicationInfo(PathUtils::resourcesPath() + "info/ApplicationInfo.ini", QSettings::IniFormat);
+        // // set the associated application properties
+        // applicationInfo.beginGroup("INFO");
+        // QCoreApplication::setApplicationName(applicationInfo.value("name").toString());
+        // QCoreApplication::setOrganizationName(applicationInfo.value("organizationName").toString());
+        // QCoreApplication::setOrganizationDomain(applicationInfo.value("organizationDomain").toString());
         
         // Let's set up the settings Private instance on its own thread
         QThread* thread = new QThread();