More on graph editor

[cpPlugins.git] / lib / third_party / Pluma / PluginManager.cpp

diff --git a/lib/third_party/Pluma/PluginManager.cpp b/lib/third_party/Pluma/PluginManager.cpp
index 491a1a9f5a9b653b3f939573f01d24f92f1834cf..6cfe12e1a1c86178f81848349190bbdf1461ca47 100644 (file)
--- a/lib/third_party/Pluma/PluginManager.cpp
+++ b/lib/third_party/Pluma/PluginManager.cpp
@@ -22,7 +22,6 @@
 //\r
 ////////////////////////////////////////////////////////////\r
 \r
-\r
 ////////////////////////////////////////////////////////////\r
 // Headers\r
 ////////////////////////////////////////////////////////////\r
@@ -106,18 +105,24 @@ bool PluginManager::load(const std::string& folder, const std::string& pluginNam
     return load(folder + '/' + pluginName);\r
 }\r
 \r
-\r
 ////////////////////////////////////////////////////////////\r
-int PluginManager::loadFromFolder(const std::string& folder, bool recursive){\r
-    std::list<std::string> files;\r
+  std::list< std::string > PluginManager::loadFromFolder(const std::string& folder, bool recursive){\r
+    std::list<std::string> files, loaded_files;\r
     dir::listFiles(files, folder, PLUMA_LIB_EXTENSION, recursive);\r
     // try to load every library\r
-    int res = 0;\r
     std::list<std::string>::const_iterator it;\r
     for (it = files.begin() ; it != files.end() ; ++it){\r
-        if ( load(*it) ) ++res;\r
+      // *** LFV ***\r
+      try\r
+      {\r
+        if ( load(*it) ) loaded_files.push_back( *it );\r
+      }\r
+      catch( ... )\r
+      {\r
+      } // yrt\r
+      // *** LFV ***\r
     }\r
-    return res;\r
+    return loaded_files;\r
 }\r
 \r
 \r