If a project was created with lower case plugin IDs, try also with no…

…n lower case IDs for newly created nodes
YakoYakoYokuYoku · May 3, 2016 · 7c3958a · 7c3958a
1 parent f06a79d
commit 7c3958a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/Engine/AppInstance.cpp b/Engine/AppInstance.cpp
@@ -1037,7 +1037,7 @@ AppInstance::createNodeInternal(CreateNodeArgs& args)
     QString findId;
 
     //Roto has moved to a built-in plugin
-    if ( ( (args.reason == eCreateNodeReasonUserCreate) || (args.reason == eCreateNodeReasonProjectLoad) ) &&
+    if ( (args.reason == eCreateNodeReasonUserCreate || args.reason == eCreateNodeReasonInternal || args.reason == eCreateNodeReasonProjectLoad) &&
          ( ( !_imp->_projectCreatedWithLowerCaseIDs && ( args.pluginID == QString::fromUtf8(PLUGINID_OFX_ROTO) ) ) || ( _imp->_projectCreatedWithLowerCaseIDs && ( args.pluginID == QString::fromUtf8(PLUGINID_OFX_ROTO).toLower() ) ) ) ) {
         findId = QString::fromUtf8(PLUGINID_NATRON_ROTO);
     } else {

diff --git a/Engine/AppManager.cpp b/Engine/AppManager.cpp
@@ -1715,19 +1715,22 @@ AppManager::getPluginBinary(const QString & pluginId,
     PluginsMap::const_iterator foundID = _imp->_plugins.end();
 
     for (PluginsMap::const_iterator it = _imp->_plugins.begin(); it != _imp->_plugins.end(); ++it) {
+        QString pID = QString::fromUtf8( it->first.c_str() );
         if ( convertToLowerCase &&
              !pluginId.startsWith( QString::fromUtf8(NATRON_ORGANIZATION_DOMAIN_TOPLEVEL "." NATRON_ORGANIZATION_DOMAIN_SUB ".built-in.") ) ) {
-            QString lowerCase = QString::fromUtf8( it->first.c_str() ).toLower();
+
+            QString lowerCase = pID.toLower();
             if (lowerCase == pluginId) {
                 foundID = it;
                 break;
             }
-        } else {
-            if (QString::fromUtf8( it->first.c_str() ) == pluginId) {
-                foundID = it;
-                break;
-            }
         }
+
+        if (pID == pluginId) {
+            foundID = it;
+            break;
+        }
+
     }