Fix issues with CreateInstanceName, a virtual function, being called
in an initializer.
llvm-svn: 114107
diff --git a/lldb/source/Core/UserSettingsController.cpp b/lldb/source/Core/UserSettingsController.cpp
index b97aa1d..4a604ca 100644
--- a/lldb/source/Core/UserSettingsController.cpp
+++ b/lldb/source/Core/UserSettingsController.cpp
@@ -2187,6 +2187,7 @@
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 @@
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)
{