why is this double encoded

2 files changed, 17 insertions, 4 deletions

diff --git a/app/client/dashboard/dashboardHeader.component.js b/app/client/dashboard/dashboardHeader.component.js
index 9acee35..10b2241 100644
--- a/app/client/dashboard/dashboardHeader.component.js
+++ b/app/client/dashboard/dashboardHeader.component.js
@@ -44,13 +44,12 @@ class DashboardHeader extends Component {
         <div>
           Currently {util.gerund(task.activity)} {task.module} on {task.dataset}<br/>
           {eta && <span>Epoch: {task.epoch} / {task.epochs}, ETA {eta}<br/></span>}
-          <br />
-          Want to play live? <button>Pause at the end of this epoch</button>
         </div>
       )
     }
   }
 }
+// Want to play live? <button>Pause at the end of this epoch</button>
 
 const mapStateToProps = state => ({
   runner: state.system.runner,
diff --git a/app/client/socket/socket.task.js b/app/client/socket/socket.task.js
index 77f1310..1b33cd9 100644
--- a/app/client/socket/socket.task.js
+++ b/app/client/socket/socket.task.js
@@ -5,9 +5,23 @@ import { socket } from './socket.connection'
 
 let finishTimeout;
 
-socket.on('task_res', (data) => {
+socket.on('task_res', (raw_data) => {
   // does not like the nested task object for some reason..
-  data = JSON.parse(data)
+  console.log(typeof raw_data)
+  let data;
+  try {
+    if (typeof raw_data === 'string') {
+      data = JSON.parse(raw_data)
+      if (typeof data === 'string') {
+        data = JSON.parse(data)
+      }
+    } else {
+      data = raw_data
+    }
+  } catch (e) {
+    console.warn('problem with json', e)
+    return
+  }
   if (data.task) {
     dispatch({ type: types.task.update, data: data.task })
   }