aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/sd_hijack.py3
-rw-r--r--modules/sd_models.py3
2 files changed, 6 insertions, 0 deletions
diff --git a/modules/sd_hijack.py b/modules/sd_hijack.py
index 7e50f1ab..14e7f799 100644
--- a/modules/sd_hijack.py
+++ b/modules/sd_hijack.py
@@ -216,6 +216,9 @@ class StableDiffusionModelHijack:
self.comments = []
def get_prompt_lengths(self, text):
+ if self.clip is None:
+ return "-", "-"
+
_, token_count = self.clip.process_texts([text])
return token_count, self.clip.get_target_prompt_token_count(token_count)
diff --git a/modules/sd_models.py b/modules/sd_models.py
index 4c9a0a1f..dddbc6e1 100644
--- a/modules/sd_models.py
+++ b/modules/sd_models.py
@@ -414,6 +414,9 @@ class SdModelData:
def get_sd_model(self):
if self.sd_model is None:
with self.lock:
+ if self.sd_model is not None:
+ return self.sd_model
+
try:
load_model()
except Exception as e: