diff --git a/py/easyNodes.py b/py/easyNodes.py index d845be6..b73b1b1 100644 --- a/py/easyNodes.py +++ b/py/easyNodes.py @@ -4331,7 +4331,7 @@ class samplerFull: 'loader_settings'] else (None, None, None) method = layerDiffuse.get_layer_diffusion_method(pipe['loader_settings']['layer_diffusion_method'], samp_blend_samples is not None) - images = pipe["images"].movedim(-1, 1) if "images" in pipe else None + images = pipe["images"].movedim(-1, 1) if "images" in pipe and pipe['images'] else None weight = pipe['loader_settings']['layer_diffusion_weight'] if 'layer_diffusion_weight' in pipe[ 'loader_settings'] else 1.0 samp_model, samp_positive, samp_negative = layerDiffuse.apply_layer_diffusion(samp_model, method, weight, diff --git a/web/js/image_chooser/chooser.js b/web/js/image_chooser/chooser.js index 4ef5247..5575e3f 100644 --- a/web/js/image_chooser/chooser.js +++ b/web/js/image_chooser/chooser.js @@ -84,10 +84,10 @@ function progressButtonPressed() { restart_from_here(node.id).then(() => { send_message(node.id, [...node.selected, -1, ...node.anti_selected]); }); } const maxlength = node.imgs.length; - if (FlowState.paused_here(node.id) && selected>0) { - node.send_button_widget.name = (selected>1) ? "Progress selected (" + selected + '/' + maxlength +")" : "Progress selected image"; - } else if (FlowState.idle() && selected>0) { - node.send_button_widget.name = (selected>1) ? "Progress selected (" + selected + '/' + maxlength +")" : "Progress selected image as restart"; + if (FlowState.paused_here(node.id) && selected.length>0) { + node.send_button_widget.name = (selected.length>1) ? "Progress selected (" + selected.length + '/' + maxlength +")" : "Progress selected image"; + } else if (FlowState.idle() && selected.length>0) { + node.send_button_widget.name = (selected.length>1) ? "Progress selected (" + selected.length + '/' + maxlength +")" : "Progress selected image as restart"; } else { node.send_button_widget.name = "";