diff --git a/include/Http.h b/include/Http.h index 84f49f7..910022e 100644 --- a/include/Http.h +++ b/include/Http.h @@ -17,5 +17,4 @@ public: static void StartProxy(); public: static bool isDownload; - static inline bool SkipSslVerify = false; }; diff --git a/src/Startup.cpp b/src/Startup.cpp index 5a58aa0..6a9b7df 100644 --- a/src/Startup.cpp +++ b/src/Startup.cpp @@ -232,11 +232,9 @@ void LinuxPatch() { void InitLauncher() { SetConsoleTitleA(("BeamMP Launcher v" + std::string(GetVer()) + GetPatch()).c_str()); - InitLog(); CheckName(); LinuxPatch(); CheckLocalKey(); - ConfigInit(); CheckForUpdates(std::string(GetVer()) + GetPatch()); } #elif defined(__linux__) @@ -245,7 +243,6 @@ void InitLauncher() { info("BeamMP Launcher v" + GetVer() + GetPatch()); CheckName(); CheckLocalKey(); - ConfigInit(); CheckForUpdates(std::string(GetVer()) + GetPatch()); } #endif diff --git a/src/main.cpp b/src/main.cpp index cc4ef67..e7e7048 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -38,23 +38,10 @@ int main(int argc, const char** argv) try { curl_global_init(CURL_GLOBAL_ALL); -#if defined(_WIN32) - system("cls"); -#elif defined(__linux__) - system("clear"); -#endif - - GetEP(argv[0]); - for (int i = 0; i < argc; ++i) { - if (std::string_view(argv[i]) == "--skip-ssl-verify") { - info("SSL verification skip enabled"); - HTTP::SkipSslVerify = true; - } - } - InitLog(); + ConfigInit(); InitOptions(argc, argv, options); InitLauncher();