5 files changed, 40 insertions, 31 deletions
diff --git a/app/client/modules/pix2pix/pix2pix.actions.js b/app/client/modules/pix2pix/pix2pix.actions.js
index 50cceb6..ef841fa 100644
--- a/app/client/modules/pix2pix/pix2pix.actions.js
+++ b/app/client/modules/pix2pix/pix2pix.actions.js
@@ -121,17 +121,17 @@ export const load_directories = (id) => (dispatch) => {
         checkpoints: checkpointDirectories,
       },
     })
-    if (id) {
-      console.log('folder id', id)
-      dispatch({
-        type: types.dataset.set_folder,
-        data: {
-          folder_id: id,
-          module
-        },
-      })
-    }
   }).catch(e => {
     console.error(e)
   })
+  if (id) {
+    console.log('folder id', id)
+    dispatch({
+      type: types.dataset.set_folder,
+      data: {
+        folder_id: id,
+        module
+      },
+    })
+  }
 }
diff --git a/app/client/modules/pix2pixhd/pix2pixhd.actions.js b/app/client/modules/pix2pixhd/pix2pixhd.actions.js
index 370597b..8e481d3 100644
--- a/app/client/modules/pix2pixhd/pix2pixhd.actions.js
+++ b/app/client/modules/pix2pixhd/pix2pixhd.actions.js
@@ -136,6 +136,16 @@ export const load_directories = (id) => (dispatch) => {
   }).catch(e => {
     console.error(e)
   })
+  if (id) {
+    console.log('folder id', id)
+    dispatch({
+      type: types.dataset.set_folder,
+      data: {
+        folder_id: id,
+        module
+      },
+    })
+  }
 }
 
 export const load_results = (id) => (dispatch) => {
diff --git a/app/client/modules/pix2pixhd/views/pix2pixhd.live.js b/app/client/modules/pix2pixhd/views/pix2pixhd.live.js
index a6da1ec..1700128 100644
--- a/app/client/modules/pix2pixhd/views/pix2pixhd.live.js
+++ b/app/client/modules/pix2pixhd/views/pix2pixhd.live.js
@@ -126,6 +126,7 @@ class Pix2PixHDLive extends Component {
                 min={0.0} max={2.0} type='float'
               />
               {this.renderRestartButton()}
+              {this.renderLiveButtons()}
               {this.renderRecordButton()}
               <p class='last_message'>{this.props.last_message}</p>
             </ParamGroup>
@@ -281,7 +282,6 @@ class Pix2PixHDLive extends Component {
           title={'GPU Busy'}
           onClick={() => this.interrupt()}
         >Interrupt</Button>
-        {this.renderLiveButtons()}
       </div>
     )
   }
diff --git a/app/client/modules/pix2wav/pix2wav.actions.js b/app/client/modules/pix2wav/pix2wav.actions.js
index 48d0496..5d1c549 100644
--- a/app/client/modules/pix2wav/pix2wav.actions.js
+++ b/app/client/modules/pix2wav/pix2wav.actions.js
@@ -79,18 +79,17 @@ export const load_directories = (id) => (dispatch) => {
         checkpoints: checkpointDirectories.concat(pix2pixCheckpointDirectories),
       },
     })
-
-    if (id) {
-      console.log('folder id', id)
-      dispatch({
-        type: types.dataset.set_folder,
-        data: {
-          folder_id: id,
-          module
-        },
-      })
-    }
   }).catch(e => {
     console.error(e)
   })
+  if (id) {
+    console.log('folder id', id)
+    dispatch({
+      type: types.dataset.set_folder,
+      data: {
+        folder_id: id,
+        module
+      },
+    })
+  }
 }
diff --git a/app/client/modules/samplernn/samplernn.actions.js b/app/client/modules/samplernn/samplernn.actions.js
index 3fd4fc1..f4f7a6d 100644
--- a/app/client/modules/samplernn/samplernn.actions.js
+++ b/app/client/modules/samplernn/samplernn.actions.js
@@ -108,18 +108,18 @@ export const load_directories = (id) => (dispatch) => {
         output,
       },
     })
-    if (id) {
-      dispatch({
-        type: types.dataset.set_folder,
-        data: {
-          folder_id: id,
-          module
-        },
-      })
-    }
   }).catch(e => {
     console.error(e)
   })
+  if (id) {
+    dispatch({
+      type: types.dataset.set_folder,
+      data: {
+        folder_id: id,
+        module
+      },
+    })
+  }
 }
 
 export const load_graph = () => dispatch => {