From 1d4ea2164f6fdce9b2b36e79b333e417d816da71 Mon Sep 17 00:00:00 2001
From: Jonas Hermsmeier <jhermsmeier@gmail.com>
Date: Thu, 19 Apr 2018 21:46:03 +0200
Subject: [PATCH] fix(gui): De-serialize errors from flashResults

Change-Type: patch
---
 lib/gui/app/modules/image-writer.js | 8 ++++++--
 lib/gui/modules/child-writer.js     | 4 ++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/gui/app/modules/image-writer.js b/lib/gui/app/modules/image-writer.js
index f4a3a61b..ec38ebbf 100644
--- a/lib/gui/app/modules/image-writer.js
+++ b/lib/gui/app/modules/image-writer.js
@@ -132,12 +132,16 @@ exports.performWrite = (image, drives, onProgress) => {
         failed: 0
       }
     }
+
     ipc.server.on('fail', (error) => {
       console.log('Fail:', error)
     })
 
-    ipc.server.on('done', (results) => {
-      _.merge(flashResults, results)
+    ipc.server.on('done', (event) => {
+      event.results.errors = _.map(event.results.errors, (data) => {
+        return errors.fromJSON(data)
+      })
+      _.merge(flashResults, event)
     })
 
     ipc.server.on('state', (progress) => {
diff --git a/lib/gui/modules/child-writer.js b/lib/gui/modules/child-writer.js
index 36552dc0..c0328892 100644
--- a/lib/gui/modules/child-writer.js
+++ b/lib/gui/modules/child-writer.js
@@ -16,6 +16,7 @@
 
 'use strict'
 
+const _ = require('lodash')
 const ipc = require('node-ipc')
 const EXIT_CODES = require('../../shared/exit-codes')
 const errors = require('../../shared/errors')
@@ -138,6 +139,9 @@ ipc.connectTo(IPC_SERVER_ID, () => {
      */
     const onFinish = (results) => {
       log(`Finish: ${results.bytesWritten}`)
+      results.errors = _.map(results.errors, (error) => {
+        return errors.toJSON(error)
+      })
       ipc.of[IPC_SERVER_ID].emit('done', { results })
       terminate(exitCode)
     }