diff options
| author | isanae <14251494+isanae@users.noreply.github.com> | 2020-11-12 03:15:14 -0500 |
|---|---|---|
| committer | isanae <14251494+isanae@users.noreply.github.com> | 2020-11-12 03:15:14 -0500 |
| commit | 6ae27224b0dcc860b882bebff3149828d874c832 (patch) | |
| tree | 0eb2c9b5dcc26a1b658ef49c28c09af39728df09 /src/instancemanager.cpp | |
| parent | a0c26517028a25ccd39dc92f9da8539f25db85fc (diff) | |
fixed a bunch of instance and command line stuff
- clear instance manager overrides when restarting, or switching instances after starting MO with moshortcut://instance: won't do anything
- clear overrides when the last selected instance can't be opened; MO would keep trying to open shortcuts even after selecting a different instance
- command line was cleared too early, before the first run, so shortcuts were broken
- the instance manager dialog can be opened without an instance loaded if the last selected instance doesn't exist, createNew() would throw because it tried to access the global Settings
- fixed some problems with parts of MO wanting to restart and others expecting flow to continue
- fixed create instance dialog using settings pointer to decide whether to restart; it restarts when it's the first created instance, which is not always the case even if the settings are null, so just check whether there are instances
Diffstat (limited to 'src/instancemanager.cpp')
| -rw-r--r-- | src/instancemanager.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/instancemanager.cpp b/src/instancemanager.cpp index 4191f850..2753fc4c 100644 --- a/src/instancemanager.cpp +++ b/src/instancemanager.cpp @@ -538,6 +538,12 @@ void InstanceManager::overrideProfile(const QString& profileName) m_overrideProfileName = profileName; } +void InstanceManager::clearOverrides() +{ + m_overrideInstanceName = {}; + m_overrideProfileName = {}; +} + std::optional<Instance> InstanceManager::currentInstance() const { const QString profile = m_overrideProfileName ? |
