diff options
| author | AUTOMATIC <16777216c@gmail.com> | 2022-09-18 17:55:55 +0000 |
|---|---|---|
| committer | AUTOMATIC <16777216c@gmail.com> | 2022-09-18 17:55:55 +0000 |
| commit | 21086e60a9e4ad6f677ccc7719be651356c18a2e (patch) | |
| tree | b796f46ddb07d4474031fcf20e731ac81a2e4534 | |
| parent | cae5c5fa8d88a6d4206ec7d89e53685d53afe4c0 (diff) | |
| parent | 4380b6598c799236bbcf6ddb393570e38e6c8930 (diff) | |
| download | stable-diffusion-webui-gfx803-21086e60a9e4ad6f677ccc7719be651356c18a2e.tar.gz stable-diffusion-webui-gfx803-21086e60a9e4ad6f677ccc7719be651356c18a2e.tar.bz2 stable-diffusion-webui-gfx803-21086e60a9e4ad6f677ccc7719be651356c18a2e.zip | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | javascript/imageviewer.js | 3 | ||||
| -rw-r--r-- | modules/processing.py | 2 |
2 files changed, 4 insertions, 1 deletions
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; } } diff --git a/modules/processing.py b/modules/processing.py index 39029e8e..b237b3c5 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,
|