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

Manager: fix display bug with <dont_suspend_nci>

This commit is contained in:
David Anderson 2015-03-10 11:01:12 -07:00
parent c8644c28b7
commit 0a06877c83
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clientgui/MainDocument.cpp
View File

@ -2500,6 +2500,15 @@ wxString result_description(RESULT* result, bool show_resources) {
strBuffer += _("Project suspended by user");
} else if (result->suspended_via_gui) {
strBuffer += _("Task suspended by user");
// do this check before the following because (if dont_suspend_nci is set)
// an NCI task may be running even if computation suspended
//
} else if (result->active_task && result->scheduler_state == CPU_SCHED_SCHEDULED) {
strBuffer += _("Running");
if (project && project->non_cpu_intensive) {
strBuffer += _(" (non-CPU-intensive)");
}
} else if (status.task_suspend_reason && !throttled) {
strBuffer += _("Suspended - ");
strBuffer += suspend_reason_wxstring(status.task_suspend_reason);
@ -2511,11 +2520,6 @@ wxString result_description(RESULT* result, bool show_resources) {
strBuffer += _("Waiting for memory");
} else if (result->needs_shmem) {
strBuffer += _("Waiting for shared memory");
} else if (result->scheduler_state == CPU_SCHED_SCHEDULED) {
strBuffer += _("Running");
if (project && project->non_cpu_intensive) {
strBuffer += _(" (non-CPU-intensive)");
}
} else if (result->scheduler_state == CPU_SCHED_PREEMPTED) {
strBuffer += _("Waiting to run");
} else if (result->scheduler_state == CPU_SCHED_UNINITIALIZED) {