summaryrefslogtreecommitdiff
path: root/src/instancemanager.cpp
diff options
context:
space:
mode:
authorLostDragonist <lost.dragonist@gmail.com>2018-12-20 14:33:08 -0600
committerGitHub <noreply@github.com>2018-12-20 14:33:08 -0600
commited67ac211306bee2067178ace1a0a7fbcd0bea1b (patch)
tree8fe31503ba20a436457c8c94d61f953b4aa067b4 /src/instancemanager.cpp
parent2232bdfc779b8575c8374a723d4d02a2b41fb352 (diff)
parent9a33dc148054443cb0efd5916ff758fca5bc09e3 (diff)
Merge pull request #586 from ModOrganizer2/Develop
Release 2.1.6
Diffstat (limited to 'src/instancemanager.cpp')
-rw-r--r--src/instancemanager.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/instancemanager.cpp b/src/instancemanager.cpp
index 1c6542e8..9066741d 100644
--- a/src/instancemanager.cpp
+++ b/src/instancemanager.cpp
@@ -66,6 +66,7 @@ void InstanceManager::clearCurrentInstance()
{
setCurrentInstance("");
m_Reset = true;
+ m_overrideInstance = false;
}
void InstanceManager::setCurrentInstance(const QString &name)
@@ -136,12 +137,13 @@ QString InstanceManager::queryInstanceName(const QStringList &instanceList) cons
QInputDialog dialog;
dialog.setWindowTitle(QObject::tr("Enter a Name for the new Instance"));
- dialog.setLabelText(QObject::tr("Enter a new name or select one from the suggested list:"));
+ dialog.setLabelText(QObject::tr("Enter a new name or select one from the suggested list: \n"
+ "(This is just the name of the Instance, not the game selection)"));
// would be neat if we could take the names from the game plugins but
// the required initialization order requires the ini file to be
// available *before* we load plugins
- dialog.setComboBoxItems({ "NewName", "Fallout 4", "SkyrimSE", "Skyrim", "Fallout 3",
- "Fallout NV", "FO4VR", "Oblivion" });
+ dialog.setComboBoxItems({ "NewName", "Fallout 4", "SkyrimSE", "Skyrim", "SkyrimVR", "Fallout 3",
+ "Fallout NV", "TTW", "FO4VR", "Oblivion", "Morrowind" });
dialog.setComboBoxEditable(true);
if (dialog.exec() == QDialog::Rejected) {
@@ -324,4 +326,4 @@ QString InstanceManager::sanitizeInstanceName(const QString &name) const
return sanitizeInstanceName(new_name);
}
return new_name;
-} \ No newline at end of file
+}