fix(systemLoads): fix temp output when no temp sensor was found in kl…

…ipper Signed-off-by: Stefan Dej <meteyou@gmail.com>
mainsail-crew · Jun 10, 2024 · 3d8f2ac · 3d8f2ac
1 parent 421d2b1
commit 3d8f2ac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/components/panels/Machine/SystemPanelHost.vue b/src/components/panels/Machine/SystemPanelHost.vue
@@ -39,7 +39,7 @@
                             {{ $t('Machine.SystemPanel.Values.Load', { load: hostStats.load }) }},
                         </span>
                         <span v-if="hostStats.memoryFormat" class="d-inline-block text-no-wrap">
-                            {{ $t('Machine.SystemPanel.Values.Memory', { memory: hostStats.memoryFormat }) }},
+                            {{ $t('Machine.SystemPanel.Values.Memory', { memory: hostStats.memoryFormat }) }}
                         </span>
                         <span class="text-no-wrap">
                             <template v-if="hostStats.tempSensor">
@@ -51,6 +51,7 @@
                                     <v-tooltip top>
                                         <template #activator="{ on, attrs }">
                                             <span v-bind="attrs" v-on="on">
+                                                ,
                                                 {{
                                                     $t('Machine.SystemPanel.Values.Temp', {
                                                         temp: hostStats.tempSensor.temperature,
@@ -74,6 +75,7 @@
                                     </v-tooltip>
                                 </template>
                                 <span v-else>
+                                    ,
                                     {{
                                         $t('Machine.SystemPanel.Values.Temp', {
                                             temp: hostStats.tempSensor.temperature,

diff --git a/src/store/server/getters.ts b/src/store/server/getters.ts
@@ -108,7 +108,7 @@ export const getters: GetterTree<ServerState, any> = {
             else if (memUsage && memUsage > 80) memUsageColor = 'warning'
 
             let tempSensor = rootGetters['printer/getHostTempSensor']
-            if (tempSensor === null) {
+            if (tempSensor === null && state.cpu_temp !== null) {
                 tempSensor = {
                     temperature: state.cpu_temp?.toFixed(0),
                     measured_min_temp: null,