diff --git a/client/work_fetch.cpp b/client/work_fetch.cpp index e6b3a7500c..a94779ff7c 100644 --- a/client/work_fetch.cpp +++ b/client/work_fetch.cpp @@ -474,7 +474,7 @@ void WORK_FETCH::piggyback_work_request(PROJECT* p) { clear_request(); if (config.fetch_minimal_work && gstate.had_or_requested_work) return; if (p->non_cpu_intensive) { - if (!has_a_job_in_progress(p)) { + if (!has_a_job_in_progress(p) && !p->dont_request_more_work) { rsc_work_fetch[0].req_secs = 1; } return; diff --git a/html/inc/host.inc b/html/inc/host.inc index 93045b5d23..064005d37f 100644 --- a/html/inc/host.inc +++ b/html/inc/host.inc @@ -117,6 +117,9 @@ function show_host($host, $user, $ipprivate) { row2(tra("Coprocessors"), gpu_desc($host->serialnum)); } row2(tra("Operating System"), "$host->os_name
$host->os_version"); + if ($user && $host->product_name) { + row2(tra("Product name"), $host->product_name); + } $v = boinc_version($host->serialnum); if ($v) { row2(tra("BOINC version"), $v); @@ -124,9 +127,11 @@ function show_host($host, $user, $ipprivate) { $x = $host->m_nbytes/(1024*1024); $y = round($x, 2); row2(tra("Memory"), tra("%1 MB", $y)); - $x = $host->m_cache/1024; - $y = round($x, 2); - row2(tra("Cache"), tra("%1 KB", $y)); + if ($host->m_cache > 0) { + $x = $host->m_cache/1024; + $y = round($x, 2); + row2(tra("Cache"), tra("%1 KB", $y)); + } if ($user) { $x = $host->m_swap/(1024*1024); diff --git a/lib/str_util.cpp b/lib/str_util.cpp index fe951a89fc..475cfc8999 100644 --- a/lib/str_util.cpp +++ b/lib/str_util.cpp @@ -575,6 +575,7 @@ const char* suspend_reason_string(int reason) { case SUSPEND_REASON_WIFI_STATE: return "not connected to WiFi network"; case SUSPEND_REASON_BATTERY_CHARGING: return "battery low"; case SUSPEND_REASON_BATTERY_OVERHEATED: return "battery thermal protection"; + case SUSPEND_REASON_NO_GUI_KEEPALIVE: return "GUI not active"; } return "unknown reason"; }