From 7e42a0f35a1595ecc5bba864a8dd0ab0fb44076d Mon Sep 17 00:00:00 2001 From: Adam Snodgrass Date: Sun, 18 Sep 2022 11:42:55 -0500 Subject: [PATCH 1/2] close on escape --- javascript/imageviewer.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/javascript/imageviewer.js b/javascript/imageviewer.js index 6ca2b4a9..95b8108d 100644 --- a/javascript/imageviewer.js +++ b/javascript/imageviewer.js @@ -53,6 +53,9 @@ function modalKeyHandler(event){ case "ArrowRight": modalNextImage(event) break; + case "Escape": + closeModal(); + break; } } From 4c17ce49495f8a2bcbafef41609db1ab6db75bc2 Mon Sep 17 00:00:00 2001 From: berkybear Date: Sun, 18 Sep 2022 09:57:50 -0700 Subject: [PATCH 2/2] handle NoneType when subseed is not initialized. Set it to -1 in that case --- modules/processing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/processing.py b/modules/processing.py index 435e17eb..2cd0bf34 100644 --- a/modules/processing.py +++ b/modules/processing.py @@ -102,7 +102,7 @@ class Processed: "prompt": self.prompt if type(self.prompt) != list else self.prompt[0], "negative_prompt": self.negative_prompt if type(self.negative_prompt) != list else self.negative_prompt[0], "seed": int(self.seed if type(self.seed) != list else self.seed[0]), - "subseed": int(self.subseed if type(self.subseed) != list else self.subseed[0]), + "subseed": int(self.subseed if type(self.subseed) != list else self.subseed[0]) if self.subseed is not None else -1, "subseed_strength": self.subseed_strength, "width": self.width, "height": self.height,