Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://isaac.ssl.berkeley.edu/boinc-v2

This commit is contained in:
Rom Walton 2014-10-12 15:52:54 -04:00
parent 1fa10ede63 0f65225da8
commit 59331061a9
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/app_control.cpp
View File

@ -371,12 +371,12 @@ void ACTIVE_TASK::handle_temporary_exit(
} else {
if (is_notice) {
msg_printf(result->project, MSG_USER_ALERT,
"Can't run task: %s", reason
"Task postponed: %s", reason
);
} else {
if (log_flags.task_debug) {
if (log_flags.task) {
msg_printf(result->project, MSG_INFO,
"[task] task called temporary_exit(%f, %s)", backoff, reason
"task postponed %f sec: %s", backoff, reason
);
}
}

7
clientgui/MainDocument.cpp
View File

@ -2535,15 +2535,14 @@ wxString result_description(RESULT* result, bool show_resources) {
}
if (result->scheduler_wait) {
if (strlen(result->scheduler_wait_reason)) {
strBuffer += _(" (Scheduler wait: ");
strBuffer = _("Postponed: ");
strBuffer += wxString(result->scheduler_wait_reason, wxConvUTF8);
strBuffer += _(")");
} else {
strBuffer += _(" (Scheduler wait)");
strBuffer = _("Postponed");
}
}
if (result->network_wait) {
strBuffer += _(" (Waiting for network access)");
strBuffer = _("Waiting for network access");
}
break;
case RESULT_COMPUTE_ERROR:

2
samples/wrapper/wrapper.cpp
View File

@ -697,7 +697,7 @@ int TASK::run(int argct, char** argvt) {
NULL,
NULL,
TRUE, // bInheritHandles
CREATE_NO_WINDOW|no_priority_change?0:IDLE_PRIORITY_CLASS,
CREATE_NO_WINDOW|(no_priority_change?0:IDLE_PRIORITY_CLASS),
(LPVOID) env_vars,
exec_dir.empty()?NULL:exec_dir.c_str(),
&startup_info,