0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: combine errors if --launch is missing

Browse Source
This commit is contained in:
Sefa Eyeoglu 2022-02-17 15:29:09 +01:00
parent 037b0d7190
commit 6b4469c6cc
No known key found for this signature in database
GPG Key ID: C10411294912A422
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
launcher/Application.cpp
View File

@ -292,18 +292,10 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
m_liveCheck = args["alive"].toBool();
m_zipToImport = args["import"].toUrl();
// error if --launch is missing with --server
if(m_instanceIdToLaunch.isEmpty() && !m_serverToJoin.isEmpty())
// error if --launch is missing with --server or --profile
if((!m_serverToJoin.isEmpty() || !m_profileToUse.isEmpty()) && m_instanceIdToLaunch.isEmpty())
{
std::cerr << "--server can only be used in combination with --launch!" << std::endl;
m_status = Application::Failed;
return;
}
// error if --launch is missing with --account
if(m_instanceIdToLaunch.isEmpty() && !m_profileToUse.isEmpty())
{
std::cerr << "--account can only be used in combination with --launch!" << std::endl;
std::cerr << "--server and --profile can only be used in combination with --launch!" << std::endl;
m_status = Application::Failed;
return;
}