Changeset 10550 for code/branches/core7/src/libraries/core/Core.cc

Timestamp:

Aug 27, 2015, 10:41:54 PM (9 years ago)

Author:

landauf

Message:

use try-catch in inner function

File:

• code/branches/core7/src/libraries/core/Core.cc (modified) (2 diffs)

code/branches/core7/src/libraries/core/Core.cc

@@ -274 +274 @@
         for (std::vector<std::string>::const_iterator it = modulePaths.begin(); it != modulePaths.end(); ++it)
         {
-            try
-            {
-                ModuleInstance* module = new ModuleInstance(*it);
-                this->loadModule(module);
-                this->modules_.push_back(module);
-            }
-            catch (...)
-            {
-                orxout(user_error) << "Couldn't load module \"" << *it << "\": " << Exception::handleMessage() << endl;
-            }
+            ModuleInstance* module = new ModuleInstance(*it);
+            this->loadModule(module);
+            this->modules_.push_back(module);
         }
 
@@ -293 +286 @@
         orxout(internal_info) << "Loading module " << module->getLibraryName() << "..." << endl;
 
-        ModuleInstance::setCurrentModuleInstance(module);
-        DynLib* dynLib = this->dynLibManager_->load(module->getLibraryName());
-        module->setDynLib(dynLib);
-
-        StaticInitializationManager::getInstance().loadModule(module);
+        try
+        {
+            ModuleInstance::setCurrentModuleInstance(module);
+            DynLib* dynLib = this->dynLibManager_->load(module->getLibraryName());
+            module->setDynLib(dynLib);
+
+            StaticInitializationManager::getInstance().loadModule(module);
+        }
+        catch (...)
+        {
+            orxout(user_error) << "Couldn't load module \"" << module->getLibraryName() << "\": " << Exception::handleMessage() << endl;
+        }
     }