Skip to content
Open
Changes from 4 commits
Commits
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
20 changes: 14 additions & 6 deletions client/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -179,16 +179,26 @@ static void signal_handler(int signum, siginfo_t*, void*) {
static void init_core_client(int argc, char** argv) {
setbuf(stdout, 0);
setbuf(stderr, 0);

cc_config.defaults();
nvc_config.defaults();
gstate.parse_cmdline(argc, argv);
gstate.now = dtime();

#ifdef _WIN32
gstate.parse_cmdline(argc, argv);
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
gstate.now = dtime();

if (!cc_config.allow_multiple_clients && !gstate.cmdline_dir) {
chdir_to_data_dir();
}

read_config_file(true);
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.

gstate.parse_cmdline(argc, argv);

#else
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
Outdated
gstate.now = dtime();
read_config_file(true);
gstate.parse_cmdline(argc, argv);
#endif

#ifndef _WIN32
Expand Down Expand Up @@ -237,7 +247,6 @@ static void init_core_client(int argc, char** argv) {
//_CrtSetBreakAlloc(654);
#endif

read_config_file(true);

// NOTE: this must be called BEFORE newer_version_startup_check()
// Only branded builds of BOINC should have an nvc_config.xml file
Expand Down Expand Up @@ -273,6 +282,7 @@ static void do_gpu_detection(int argc, char** argv) {
vector<string> warnings;

boinc_install_signal_handlers();
read_config_file(true);
gstate.parse_cmdline(argc, argv);
gstate.now = dtime();

Expand All @@ -285,8 +295,6 @@ static void do_gpu_detection(int argc, char** argv) {

diagnostics_init(flags, "stdoutgpudetect", "stderrgpudetect");

read_config_file(true);

coprocs.detect_gpus(warnings);
coprocs.write_coproc_info_file(warnings);
warnings.clear();
Expand Down
Loading