Skip to content

Make command-line arguments -i "" launch the portable instance #2341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JonathanFeenstra wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make command-line arguments -i "" launch the portable instance #2341

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7166eb8
Make command-line arguments -i "Portable" launch the portable instance
JonathanFeenstra Feb 21, 2026
a4e3a07
Launch portable instance using -i "" instead of -i "Portable"
JonathanFeenstra Apr 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions src/commandline.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
#include <log.h>
#include <report.h>

#include <boost/optional/optional_io.hpp>

namespace cl
{

Expand Down Expand Up @@ -221,8 +223,12 @@ std::optional<int> CommandLine::runEarly()

std::optional<int> CommandLine::runPostApplication(MOApplication& a)
{
// handle -i with no arguments
if (m_vm.count("instance") && m_vm["instance"].as<std::string>() == "") {
const auto instanceArg = m_vm.find("instance");
if (instanceArg != m_vm.end() &&
!instanceArg->second.as<boost::optional<std::string>>().has_value()) {

// handle -i with no arguments (distinct from -i "", which will launch the
// portable instance if it exists, hence the use of boost::optional)
env::Console c;

if (auto i = InstanceManager::singleton().currentInstance()) {
Expand Down Expand Up @@ -314,7 +320,9 @@ void CommandLine::createOptions()

("logs", "duplicates the logs to stdout")

("instance,i", po::value<std::string>()->implicit_value(""),
("instance,i",
po::value<boost::optional<std::string>>()->implicit_value(
boost::none),
"use the given instance (defaults to last used)")

("profile,p", po::value<std::string>(),
Expand Down Expand Up @@ -402,8 +410,14 @@ std::optional<QString> CommandLine::instance() const

if (m_shortcut.isValid() && m_shortcut.hasInstance()) {
return m_shortcut.instanceName();
} else if (m_vm.count("instance")) {
return QString::fromStdString(m_vm["instance"].as<std::string>());
} else {
const auto instanceArg = m_vm.find("instance");
if (instanceArg != m_vm.end()) {
const auto& instanceVal = instanceArg->second.as<boost::optional<std::string>>();
if (instanceVal.has_value()) {
return QString::fromStdString(instanceVal.value());
}
}
}

return {};
Expand Down
Loading