1 files changed, 10 insertions, 2 deletions
diff --git a/lldb/source/Target/Thread.cpp b/lldb/source/Target/Thread.cpp
index af2de6beb72..6c1dc40a7b7 100644
--- a/lldb/source/Target/Thread.cpp
+++ b/lldb/source/Target/Thread.cpp
@@ -1006,18 +1006,26 @@ Thread::GetSP ()
 
 
 void
-Thread::Initialize ()
+Thread::SettingsInitialize ()
 {
     UserSettingsControllerSP &usc = GetSettingsController();
     usc.reset (new SettingsController);
     UserSettingsController::InitializeSettingsController (usc,
                                                           SettingsController::global_settings_table,
                                                           SettingsController::instance_settings_table);
+                                                          
+    // Now call SettingsInitialize() on each 'child' setting of Thread.
+    // Currently there are none.
 }
 
 void
-Thread::Terminate ()
+Thread::SettingsTerminate ()
 {
+    // Must call SettingsTerminate() on each 'child' setting of Thread before terminating Thread settings.
+    // Currently there are none.
+    
+    // Now terminate Thread Settings.
+    
     UserSettingsControllerSP &usc = GetSettingsController();
     UserSettingsController::FinalizeSettingsController (usc);
     usc.reset();