diff options
| author | Silarn <jrim@rimpo.org> | 2019-07-22 01:00:42 -0500 |
|---|---|---|
| committer | Silarn <jrim@rimpo.org> | 2019-07-22 01:00:42 -0500 |
| commit | dcd6d624672019727d7effd17aac86f72bff438b (patch) | |
| tree | 1e8d3856f657d898c5992631599cf272d785f973 /src/instancemanager.cpp | |
| parent | 179a73857125ee604f42b0d5c2d765183c86d2c7 (diff) | |
| parent | e73c309f08eff98f0dbd2590f594a83b67431eac (diff) | |
Merge branch 'Develop'
Diffstat (limited to 'src/instancemanager.cpp')
| -rw-r--r-- | src/instancemanager.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/instancemanager.cpp b/src/instancemanager.cpp index 1c65f635..ddc2d067 100644 --- a/src/instancemanager.cpp +++ b/src/instancemanager.cpp @@ -102,7 +102,7 @@ QString InstanceManager::manageInstances(const QStringList &instanceList) const SelectionDialog selection( QString("<h3>%1</h3><br>%2") .arg(QObject::tr("Choose Instance to Delete")) - .arg(QObject::tr("Be Carefull! Deleting an Instance will remove all your files for that Instance (mods, downloads, profiles, configuration, ...). Custom paths outside of the instance folder for downloads, mods, etc. will be left untoched.")), + .arg(QObject::tr("Be Careful! Deleting an Instance will remove all your files for that Instance (mods, downloads, profiles, configuration, ...). Custom paths outside of the instance folder for downloads, mods, etc. will be left untoched.")), nullptr); for (const QString &instance : instanceList) { @@ -217,6 +217,8 @@ QString InstanceManager::chooseInstance(const QStringList &instanceList) const QObject::tr("Delete an Instance."), static_cast<uint8_t>(Special::Manage)); + selection.setWindowFlags(selection.windowFlags() | Qt::WindowStaysOnTopHint); + if (selection.exec() == QDialog::Rejected) { qDebug("rejected"); throw MOBase::MyException(QObject::tr("Canceled")); @@ -227,7 +229,7 @@ QString InstanceManager::chooseInstance(const QStringList &instanceList) const if (choice.type() == QVariant::String) { return choice.toString(); } else { - switch (choice.value<uint8_t>()) { + switch (static_cast<Special>(choice.value<uint8_t>())) { case Special::NewInstance: return queryInstanceName(instanceList); case Special::Portable: return QString(); case Special::Manage: { |