Version changing removes any existing version json.

1 files changed, 30 insertions, 22 deletions

diff --git a/logic/LegacyInstance.h b/logic/LegacyInstance.h
index d7438cca..8bf334f6 100644
--- a/logic/LegacyInstance.h
+++ b/logic/LegacyInstance.h
@@ -9,21 +9,22 @@ class LegacyInstance : public BaseInstance
 {
 	Q_OBJECT
 public:
-	
-	explicit LegacyInstance(const QString &rootDir, SettingsObject * settings, QObject *parent = 0);
-	
+
+	explicit LegacyInstance(const QString &rootDir, SettingsObject *settings,
+							QObject *parent = 0);
+
 	/// Path to the instance's minecraft.jar
 	QString runnableJar() const;
-	
+
 	//! Path to the instance's modlist file.
 	QString modListFile() const;
-	
+
 	//////  Mod Lists  //////
 	std::shared_ptr<ModList> jarModList();
 	std::shared_ptr<ModList> coreModList();
 	std::shared_ptr<ModList> loaderModList();
 	std::shared_ptr<ModList> texturePackList();
-	
+
 	////// Directories //////
 	QString savesDir() const;
 	QString texturePacksDir() const;
@@ -33,40 +34,47 @@ public:
 	QString coreModsDir() const;
 	QString resourceDir() const;
 	virtual QString instanceConfigFolder() const;
-	
+
 	/*!
 	 * Whether or not the instance's minecraft.jar needs to be rebuilt.
-	 * If this is true, when the instance launches, its jar mods will be 
+	 * If this is true, when the instance launches, its jar mods will be
 	 * re-added to a fresh minecraft.jar file.
 	 */
 	bool shouldRebuild() const;
 	void setShouldRebuild(bool val);
-	
+
 	virtual QString currentVersionId() const;
 	virtual void setCurrentVersionId(QString val);
-	
+
 	//! The version of LWJGL that this instance uses.
 	QString lwjglVersion() const;
 	/// st the version of LWJGL libs this instance will use
 	void setLWJGLVersion(QString val);
-	
+
 	virtual QString intendedVersionId() const;
-	virtual bool setIntendedVersionId ( QString version );
-	
+	virtual bool setIntendedVersionId(QString version);
+	// the `version' of Legacy instances is defined by the launcher code.
+	// in contrast with OneSix, where `version' is described in a json file
+	virtual bool versionIsCustom() override
+	{
+		return false;
+	};
+
 	virtual bool shouldUpdate() const;
 	virtual void setShouldUpdate(bool val);
-	virtual BaseUpdate* doUpdate();
-	
-	virtual MinecraftProcess* prepareForLaunch(LoginResponse response);
+	virtual BaseUpdate *doUpdate();
+
+	virtual MinecraftProcess *prepareForLaunch(LoginResponse response);
 	virtual void cleanupAfterRun();
-	virtual QDialog * createModEditDialog ( QWidget* parent );
-	
+	virtual QDialog *createModEditDialog(QWidget *parent);
+
 	virtual QString defaultBaseJar() const;
 	virtual QString defaultCustomBaseJar() const;
-	
-	bool menuActionEnabled ( QString action_name ) const;
+
+	bool menuActionEnabled(QString action_name) const;
 	virtual QString getStatusbarDescription();
-	
-protected slots:
+
+protected
+slots:
 	virtual void jarModsChanged();
 };
\ No newline at end of file