aboutsummaryrefslogtreecommitdiff
path: root/modules/images_history.py
diff options
context:
space:
mode:
author不会画画的中医不是好程序员 <yfszzx@gmail.com>2022-10-16 10:04:05 +0800
committerGitHub <noreply@github.com>2022-10-16 10:04:05 +0800
commitd41ac174e24e1e7cdcf7b42f2a03cbc6394eb5e5 (patch)
treeda39175c109598f17e89fafe57aac9b9597ff616 /modules/images_history.py
parent6e4f5566b58e36aede83427df6c69eba8517af28 (diff)
parentbe1596ce30b1ead6998da0c62003003dcce5eb2c (diff)
Merge branch 'AUTOMATIC1111:master' into master
Diffstat (limited to 'modules/images_history.py')
-rw-r--r--modules/images_history.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/images_history.py b/modules/images_history.py
index f5ef44fe..9260df8a 100644
--- a/modules/images_history.py
+++ b/modules/images_history.py
@@ -97,14 +97,16 @@ def delete_image(delete_num, tabname, dir_name, name, page_index, filenames, ima
def show_images_history(gr, opts, tabname, run_pnginfo, switch_dict):
- if tabname == "txt2img":
+ if opts.outdir_samples != "":
+ dir_name = opts.outdir_samples
+ elif tabname == "txt2img":
dir_name = opts.outdir_txt2img_samples
elif tabname == "img2img":
dir_name = opts.outdir_img2img_samples
elif tabname == "extras":
dir_name = opts.outdir_extras_samples
d = dir_name.split("/")
- dir_name = d[0]
+ dir_name = "/" if dir_name.startswith("/") else d[0]
for p in d[1:]:
dir_name = os.path.join(dir_name, p)
with gr.Row():