From 34d57c59b232f4a9ee1f93f9e01940e7e263f160 Mon Sep 17 00:00:00 2001 From: inxi-svn Date: Mon, 28 Apr 2014 03:03:31 +0000 Subject: [PATCH] more mods on senses, branches/one --- inxi | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/inxi b/inxi index ef1f734..9710350 100755 --- a/inxi +++ b/inxi @@ -8399,17 +8399,24 @@ get_sensors_data() cpuTempReal=cpuTemp } } - else if ( tempFanType != "" ){ - if ( tempFanType == 1 ){ - cpuTempReal=temp1 + else { + if ( tempFanType != "" ){ + if ( tempFanType == 1 ){ + cpuTempReal=temp1 + } + else { + cpuTempReal=temp2 + } } else { - cpuTempReal=temp2 + if ( core0Temp != "" ) { + cpuTempReal=core0Temp + } + else { + cpuTempReal=temp1 + } } } - else { - cpuTempReal=temp1 - } # if all else fails, use core0/peci temp if present and cpu is null if ( cpuTempReal == "" ) { if ( core0Temp != "" ) {