diff options
| author | Weblate <noreply@weblate.org> | 2016-10-17 06:30:04 +0000 |
|---|---|---|
| committer | Weblate <noreply@weblate.org> | 2016-10-17 06:30:04 +0000 |
| commit | 15f388cffbbf3b331f38ea761995dbb98534228a (patch) | |
| tree | 8d2d406cb57eaf11c44d52272510b9982ecd67ec /src-qt5/core/libLumina/LuminaOS-FreeBSD.cpp | |
| parent | Translated using Weblate (lumina_OPEN@hu (generated)) (diff) | |
| parent | Oops - forgot to save the fallback CPU temperature reading into the variable. (diff) | |
| download | lumina-15f388cffbbf3b331f38ea761995dbb98534228a.tar.gz lumina-15f388cffbbf3b331f38ea761995dbb98534228a.tar.bz2 lumina-15f388cffbbf3b331f38ea761995dbb98534228a.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src-qt5/core/libLumina/LuminaOS-FreeBSD.cpp')
| -rw-r--r-- | src-qt5/core/libLumina/LuminaOS-FreeBSD.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src-qt5/core/libLumina/LuminaOS-FreeBSD.cpp b/src-qt5/core/libLumina/LuminaOS-FreeBSD.cpp index 5cdf18bc..2bffb5a1 100644 --- a/src-qt5/core/libLumina/LuminaOS-FreeBSD.cpp +++ b/src-qt5/core/libLumina/LuminaOS-FreeBSD.cpp @@ -292,8 +292,10 @@ QString LOS::FileSystemCapacity(QString dir) { //Return: percentage capacity as QStringList LOS::CPUTemperatures(){ //Returns: List containing the temperature of any CPU's ("50C" for example) static QStringList vars = QStringList(); QStringList temps; - if(vars.isEmpty()){ temps = LUtils::getCmdOutput("sysctl -i hw.").filter(".temperature:"); } - else{ temps = LUtils::getCmdOutput("sysctl "+vars.join(" ")); vars.clear(); } + if(vars.isEmpty()){ + temps = LUtils::getCmdOutput("sysctl -i dev.cpu").filter(".temperature:"); //try direct readings first + if(temps.isEmpty()){ temps = LUtils::getCmdOutput("sysctl -i hw.acpi").filter(".temperature:"); } // then try acpi values + }else{ temps = LUtils::getCmdOutput("sysctl "+vars.join(" ")); vars.clear(); } temps.sort(); for(int i=0; i<temps.length(); i++){ |