summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLostDragonist <lost.dragonist@gmail.com>2018-11-02 21:02:14 -0500
committerLostDragonist <lost.dragonist@gmail.com>2018-11-02 21:02:30 -0500
commit17f1cf0aabf29453f7c00644f7aee93f83f2bca8 (patch)
tree4454a5c4d5414e3cf00e908fe142f79ab5e17a26 /src
parent78cd0110d3b84af0b6eda12ea6134595d9fce47f (diff)
Allow switching instances when MO is launched with moshortcut://<instance>:
Diffstat (limited to 'src')
-rw-r--r--src/instancemanager.cpp3
-rw-r--r--src/main.cpp1
2 files changed, 3 insertions, 1 deletions
diff --git a/src/instancemanager.cpp b/src/instancemanager.cpp
index 1c6542e8..9e785fc4 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)
@@ -324,4 +325,4 @@ QString InstanceManager::sanitizeInstanceName(const QString &name) const
return sanitizeInstanceName(new_name);
}
return new_name;
-} \ No newline at end of file
+}
diff --git a/src/main.cpp b/src/main.cpp
index bfc3b926..43b52609 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -715,5 +715,6 @@ int main(int argc, char *argv[])
return result;
}
argc = 1;
+ moshortcut = MOShortcut("");
} while (true);
}