Merge branch 'fix_json_version' into integration_json_and_tools

Conflicts:
	logic/OneSixInstance.cpp
	logic/OneSixVersionBuilder.cpp

Some fixage. Yay for conflicts.

1 files changed, 23 insertions, 0 deletions

diff --git a/logic/BaseInstance.cpp b/logic/BaseInstance.cpp
index 222004a3..d78f1ea0 100644
--- a/logic/BaseInstance.cpp
+++ b/logic/BaseInstance.cpp
@@ -37,6 +37,7 @@ BaseInstance::BaseInstance(BaseInstancePrivate *d_in, const QString &rootDir,
 	I_D(BaseInstance);
 	d->m_settings = settings_obj;
 	d->m_rootDir = rootDir;
+	d->m_flags = 0;
 
 	settings().registerSetting("name", "Unnamed Instance");
 	settings().registerSetting("iconKey", "default");
@@ -146,6 +147,28 @@ SettingsObject &BaseInstance::settings() const
 	return *d->m_settings;
 }
 
+BaseInstance::InstanceFlags BaseInstance::flags() const
+{
+	I_D(const BaseInstance);
+	return InstanceFlags(d->m_flags);
+}
+
+void BaseInstance::setFlags(const BaseInstance::InstanceFlags flags)
+{
+	I_D(BaseInstance);
+	if (flags != d->m_flags)
+	{
+		d->m_flags = flags;
+		emit flagsChanged();
+		emit propertiesChanged(this);
+	}
+}
+
+bool BaseInstance::canLaunch() const
+{
+	return !(flags() & VersionBrokenFlag);
+}
+
 QString BaseInstance::baseJar() const
 {
 	I_D(BaseInstance);