BeamMP/BeamMP-Launcher
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Launcher.git synced 2025-07-01 23:46:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix relaunch

Browse Source
This commit is contained in:
Tixx 2024-10-05 18:01:47 +02:00
parent 47681cda50
commit 5bdd8c11da
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Options.h
View File

@ -11,6 +11,8 @@ struct Options {
bool no_launch = false; bool no_launch = false;
char **game_arguments = nullptr; char **game_arguments = nullptr;
int game_arguments_length = 0; int game_arguments_length = 0;
char** argv = nullptr;
int argc = 0;
}; };
void InitOptions(int argc, char *argv[], Options &options); void InitOptions(int argc, char *argv[], Options &options);

3
src/Options.cpp
View File

@ -6,6 +6,9 @@
void InitOptions(int argc, char *argv[], Options &options) { void InitOptions(int argc, char *argv[], Options &options) {
int i = 1; int i = 1;
options.argc = argc;
options.argv = argv;
if (argc > 2) if (argc > 2)
if (std::string(argv[1]) == "0" && std::string(argv[2]) == "0") { if (std::string(argv[1]) == "0" && std::string(argv[2]) == "0") {
options.verbose = true; options.verbose = true;

16
src/Startup.cpp
View File

@ -97,9 +97,9 @@ std::string GetEP(char* P) {
#if defined(_WIN32) #if defined(_WIN32)
void ReLaunch() { void ReLaunch() {
std::string Arg; std::string Arg;
for (int c = 0; c <= options.game_arguments_length; c++) { for (int c = 2; c <= options.argc; c++) {
Arg += options.argv[c - 1];
Arg += " "; Arg += " ";
Arg += options.game_arguments[c - 1];
} }
info("Relaunch!"); info("Relaunch!");
system("cls"); system("cls");
@ -110,9 +110,9 @@ void ReLaunch() {
} }
void URelaunch() { void URelaunch() {
std::string Arg; std::string Arg;
for (int c = 0; c <= options.game_arguments_length; c++) { for (int c = 2; c <= options.argc; c++) {
Arg += options.argv[c - 1];
Arg += " "; Arg += " ";
Arg += options.game_arguments[c - 1];
} }
ShellExecute(nullptr, "open", (GetEP() + GetEN()).c_str(), Arg.c_str(), nullptr, SW_SHOWNORMAL); ShellExecute(nullptr, "open", (GetEP() + GetEN()).c_str(), Arg.c_str(), nullptr, SW_SHOWNORMAL);
ShowWindow(GetConsoleWindow(), 0); ShowWindow(GetConsoleWindow(), 0);
@ -122,9 +122,9 @@ void URelaunch() {
#elif defined(__linux__) #elif defined(__linux__)
void ReLaunch() { void ReLaunch() {
std::string Arg; std::string Arg;
for (int c = 0; c <= options.game_arguments_length; c++) { for (int c = 2; c <= options.argc; c++) {
Arg += options.argv[c - 1];
Arg += " "; Arg += " ";
Arg += options.game_arguments[c - 1];
} }
info("Relaunch!"); info("Relaunch!");
system("clear"); system("clear");
@ -134,9 +134,9 @@ void ReLaunch() {
} }
void URelaunch() { void URelaunch() {
std::string Arg; std::string Arg;
for (int c = 0; c <= options.game_arguments_length; c++) { for (int c = 2; c <= options.argc; c++) {
Arg += options.argv[c - 1];
Arg += " "; Arg += " ";
Arg += options.game_arguments[c - 1];
} }
execl((GetEP() + GetEN()).c_str(), Arg.c_str(), NULL); execl((GetEP() + GetEN()).c_str(), Arg.c_str(), NULL);
std::this_thread::sleep_for(std::chrono::seconds(1)); std::this_thread::sleep_for(std::chrono::seconds(1));