2 files changed, 10 insertions, 2 deletions
diff --git a/lldb/source/Interpreter/ScriptInterpreter.cpp b/lldb/source/Interpreter/ScriptInterpreter.cpp
index cfc2572997d..fd1e10abfbc 100644
--- a/lldb/source/Interpreter/ScriptInterpreter.cpp
+++ b/lldb/source/Interpreter/ScriptInterpreter.cpp
@@ -93,12 +93,12 @@ ScriptInterpreter::LanguageToString (lldb::ScriptLanguage language)
 void
 ScriptInterpreter::Initialize ()
 {
-    ScriptInterpreterPython::Initialize ();
+//    ScriptInterpreterPython::Initialize ();
 }
 
 void
 ScriptInterpreter::Terminate ()
 {
-    ScriptInterpreterPython::Terminate ();
+//    ScriptInterpreterPython::Terminate ();
 }
 
diff --git a/lldb/source/Interpreter/ScriptInterpreterPython.cpp b/lldb/source/Interpreter/ScriptInterpreterPython.cpp
index 224ea7f6d37..368399b08e5 100644
--- a/lldb/source/Interpreter/ScriptInterpreterPython.cpp
+++ b/lldb/source/Interpreter/ScriptInterpreterPython.cpp
@@ -224,6 +224,14 @@ ScriptInterpreterPython::ScriptInterpreterPython (CommandInterpreter &interprete
     m_valid_session (true)
 {
 
+    static int g_initialized = false;
+    
+    if (!g_initialized)
+    {
+        g_initialized = true;
+        ScriptInterpreterPython::Initialize ();
+    }
+
     bool safe_to_run = false;
     bool need_to_release_lock = true;
     int interval = 5;          // Number of seconds to try getting the Python lock before timing out.