Fix code source mode

Even when filename and moduleName were empty, a findModule was done and throws an exception preventing moduleSource to be use instead. Signed-off-by: mfe <[email protected]>
scottdyer · Jun 3, 2014 · 57b48a2 · 57b48a2
1 parent f525858
commit 57b48a2
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/lib/IlmCtl/CtlInterpreter.cpp b/lib/IlmCtl/CtlInterpreter.cpp
@@ -249,7 +249,7 @@ Interpreter::findModule (const string& moduleName)
             }
 
             THROW (ArgExc, "Cannot find CTL module \"" << moduleName << "\".");
-            return ""; 
+            return ""; // return to prevent a warning with some compilers.
         }
 
 
@@ -269,7 +269,7 @@ Interpreter::findModule (const string& moduleName)
     }
 
     THROW (ArgExc, "Cannot find CTL module \"" << moduleName << "\".");
-    return "";
+    return ""; // return to prevent a warning with some compilers.
 }
 
 void
@@ -435,7 +435,12 @@ Interpreter::loadModuleRecursive (const string &moduleName, const string &fileNa
 	return;
     }
 
-    string realFileName = fileName.empty() ? findModule (moduleName) : fileName;
+	string realFileName;
+	if(fileName.empty() && !moduleName.empty())
+		realFileName = findModule (moduleName);
+	else
+		realFileName = fileName;
+
 
 	_loadModule(moduleName, realFileName, moduleSource);
 }