1 files changed, 9 insertions, 2 deletions
diff --git a/app/client/common/currentTask.component.js b/app/client/common/currentTask.component.js
index 7dcaf83..7960e5c 100644
--- a/app/client/common/currentTask.component.js
+++ b/app/client/common/currentTask.component.js
@@ -6,8 +6,15 @@ import util from '../util'
 // import { Loading, CurrentTask, FileList, FileRow } from '../../../common'
 
 function CurrentTask ({ cpu, gpu, processor }) {
-  const processor_name = processor === 'cpu' ? 'cpu' : 'gpu'
-  const p = processor === 'cpu' ? cpu : gpu
+  let processor_name
+  if (processor) {
+    processor_name = processor === 'cpu' ? 'cpu' : 'gpu'
+  } else if (gpu.status !== 'IDLE') {
+    processor_name = 'gpu'
+  } else if (cpu.status !== 'IDLE') {
+    processor_name = 'cpu'
+  }
+  const p = processor_name === 'cpu' ? cpu : gpu
   if (!p) return <div></div>
   if (p.status === 'IDLE') {
     return <div>{processor_name} idle</div>