Fix a bug

4 files changed, 15 insertions, 6 deletions

diff --git a/gui/dialogs/OneSixModEditDialog.cpp b/gui/dialogs/OneSixModEditDialog.cpp
index a34409f5..ebd685e8 100644
--- a/gui/dialogs/OneSixModEditDialog.cpp
+++ b/gui/dialogs/OneSixModEditDialog.cpp
@@ -111,12 +111,21 @@ void OneSixModEditDialog::disableVersionControls()
 
 void OneSixModEditDialog::on_userEditorBtn_clicked()
 {
-	if (QDir(m_inst->instanceRoot()).exists("user.json"))
+	QDir root(m_inst->instanceRoot());
+	if (!root.exists("user.json"))
 	{
-		if (!MMC->openJsonEditor(m_inst->instanceRoot() + "/user.json"))
+		QFile file(root.absoluteFilePath("user.json"));
+		if (!file.open(QFile::WriteOnly))
 		{
-			QMessageBox::warning(this, tr("Error"), tr("Unable to open user.json, check the settings"));
+			QMessageBox::critical(this, tr("Error"), tr("Couldn't write a skeletion user.json file: %1").arg(file.errorString()));
+			return;
 		}
+		file.write("{\n}");
+		file.close();
+	}
+	if (!MMC->openJsonEditor(root.absoluteFilePath("user.json")))
+	{
+		QMessageBox::warning(this, tr("Error"), tr("Unable to open user.json, check the settings"));
 	}
 }
 
diff --git a/logic/ForgeInstaller.cpp b/logic/ForgeInstaller.cpp
index c7160d6e..47c42694 100644
--- a/logic/ForgeInstaller.cpp
+++ b/logic/ForgeInstaller.cpp
@@ -206,7 +206,7 @@ bool ForgeInstaller::add(OneSixInstance *to)
 	}
 
 	obj.insert("name", QString("Forge"));
-	obj.insert("id", id());
+	obj.insert("fileId", id());
 	obj.insert("version", m_forgeVersionString);
 	obj.insert("mcVersion", to->intendedVersionId());
 
diff --git a/logic/LiteLoaderInstaller.cpp b/logic/LiteLoaderInstaller.cpp
index 48bbaeff..60a43d49 100644
--- a/logic/LiteLoaderInstaller.cpp
+++ b/logic/LiteLoaderInstaller.cpp
@@ -79,7 +79,7 @@ bool LiteLoaderInstaller::add(OneSixInstance *to)
 
 	obj.insert("+libraries", libraries);
 	obj.insert("name", QString("LiteLoader"));
-	obj.insert("id", id());
+	obj.insert("fileId", id());
 	obj.insert("version", to->intendedVersionId());
 	obj.insert("mcVersion", to->intendedVersionId());
 
diff --git a/logic/OneSixVersionBuilder.cpp b/logic/OneSixVersionBuilder.cpp
index 08506d4b..a541766b 100644
--- a/logic/OneSixVersionBuilder.cpp
+++ b/logic/OneSixVersionBuilder.cpp
@@ -225,7 +225,7 @@ struct VersionFile
 		}
 
 		out.name = root.value("name").toString();
-		out.fileId = root.value("id").toString();
+		out.fileId = root.value("fileId").toString();
 		out.version = root.value("version").toString();
 		out.mcVersion = root.value("mcVersion").toString();
 		out.filename = filename;