From 9e41c15d8484ec71b31bb791bac3d3b41719bf5f Mon Sep 17 00:00:00 2001
From: Caroline Tice <ctice@apple.com>
Date: Thu, 16 Sep 2010 19:05:55 +0000
Subject: Fix issues with CreateInstanceName, a virtual function, being called
 in an initializer.

llvm-svn: 114107
---
 lldb/source/Core/UserSettingsController.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'lldb/source/Core/UserSettingsController.cpp')

diff --git a/lldb/source/Core/UserSettingsController.cpp b/lldb/source/Core/UserSettingsController.cpp
index b97aa1d7ea7..4a604cac38b 100644
--- a/lldb/source/Core/UserSettingsController.cpp
+++ b/lldb/source/Core/UserSettingsController.cpp
@@ -2187,6 +2187,7 @@ InstanceSettings::InstanceSettings (UserSettingsController &owner, const char *i
     m_instance_name (instance_name)
 {
     if ((m_instance_name != InstanceSettings::GetDefaultName())
+        && (m_instance_name !=  InstanceSettings::InvalidName())
         && live_instance)
         m_owner.RegisterInstanceSettings (this);
 }
@@ -2205,6 +2206,14 @@ InstanceSettings::GetDefaultName ()
     return g_default_settings_name;
 }
 
+const ConstString &
+InstanceSettings::InvalidName ()
+{
+    static const ConstString g_invalid_name ("Invalid instance name");
+
+    return g_invalid_name;
+}
+
 void
 InstanceSettings::ChangeInstanceName (const std::string &new_instance_name)
 {
-- 
cgit v1.2.3