Don't search for module resources at all if the setting is set to "false".

llvm-svn: 215936

2 files changed, 6 insertions, 4 deletions

diff --git a/lldb/source/Core/Module.cpp b/lldb/source/Core/Module.cpp
index e06a458a17f..225bb6d516a 100644
--- a/lldb/source/Core/Module.cpp
+++ b/lldb/source/Core/Module.cpp
@@ -1518,6 +1518,9 @@ Module::LoadScriptingResourceInTarget (Target *target, Error& error, Stream* fee
     
     LoadScriptFromSymFile should_load = target->TargetProperties::GetLoadScriptFromSymbolFile();
     
+    if (should_load == eLoadScriptFromSymFileFalse)
+        return false;
+    
     Debugger &debugger = target->GetDebugger();
     const ScriptLanguage script_language = debugger.GetScriptLanguage();
     if (script_language != eScriptLanguageNone)
@@ -1547,8 +1550,6 @@ Module::LoadScriptingResourceInTarget (Target *target, Error& error, Stream* fee
                     FileSpec scripting_fspec (file_specs.GetFileSpecAtIndex(i));
                     if (scripting_fspec && scripting_fspec.Exists())
                     {
-                        if (should_load == eLoadScriptFromSymFileFalse)
-                            return false;
                         if (should_load == eLoadScriptFromSymFileWarn)
                         {
                             if (feedback_stream)
diff --git a/lldb/source/Core/ModuleList.cpp b/lldb/source/Core/ModuleList.cpp
index 13a20ed531b..156f3cf9d0a 100644
--- a/lldb/source/Core/ModuleList.cpp
+++ b/lldb/source/Core/ModuleList.cpp
@@ -1133,9 +1133,10 @@ ModuleList::LoadScriptingResourcesInTarget (Target *target,
                                                    module->GetFileSpec().GetFileNameStrippingExtension().GetCString(),
                                                    error.AsCString());
                     errors.push_back(error);
+
+                    if (!continue_on_error)
+                        return false;
                 }
-                if (!continue_on_error)
-                    return false;
             }
         }
     }