From 8490cbf65e78b9b67ab5f9fe6a9f07dac9eebc1d Mon Sep 17 00:00:00 2001
From: Vladimir Mandic <mandic00@live.com>
Date: Sat, 8 Jul 2023 14:05:55 -0400
Subject: [PATCH] post merge cleanup

---
 installer.py      | 4 +++-
 modules/shared.py | 6 +++---
 wiki              | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/installer.py b/installer.py
index 41396c266..3093ff51e 100644
--- a/installer.py
+++ b/installer.py
@@ -649,11 +649,13 @@ def check_version(offline=False, reset=True): # pylint: disable=unused-argument
             sys.exit(1)
     ver = git('log -1 --pretty=format:"%h %ad"')
     log.info(f'Version: {ver}')
-    if args.quick or args.version or args.skip_git:
+    if args.version or args.skip_git:
         return
     commit = git('rev-parse HEAD')
     global git_commit # pylint: disable=global-statement
     git_commit = commit[:7]
+    if args.quick:
+        return
     try:
         import requests
     except ImportError:
diff --git a/modules/shared.py b/modules/shared.py
index 959ab7851..a1b4aead6 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -359,8 +359,8 @@ options_templates.update(options_section(('cuda', "Compute Settings"), {
 }))
 
 options_templates.update(options_section(('diffusers', "Diffusers Settings"), {
-    "diffusers_allow_safetensors": OptionInfo(False, 'Diffuser Pipeline when loading from safetensors'),
-    "diffusers_pipeline": OptionInfo(pipelines[0], 'Diffuser Pipeline when loading from safetensors', gr.Dropdown, lambda: {"choices": pipelines}),
+    "diffusers_allow_safetensors": OptionInfo(False, 'Diffusers allow loading from safetensors files'),
+    "diffusers_pipeline": OptionInfo(pipelines[0], 'Select diffuser pipeline when loading from safetensors', gr.Dropdown, lambda: {"choices": pipelines}),
     "diffusers_extract_ema": OptionInfo(True, "Use model EMA weights when possible"),
     "diffusers_generator_device": OptionInfo("default", "Generator device", gr.Radio, lambda: {"choices": ["default", "cpu"]}),
     "diffusers_seq_cpu_offload": OptionInfo(False, "Enable sequential CPU offload"),
@@ -478,7 +478,7 @@ options_templates.update(options_section(('live-preview', "Live Previews"), {
     "show_progress_every_n_steps": OptionInfo(1, "Live preview display period", gr.Slider, {"minimum": -1, "maximum": 32, "step": 1}),
     "show_progress_type": OptionInfo("Approximate NN", "Live preview method", gr.Radio, {"choices": ["Full VAE", "Approximate NN", "Approximate simple", "TAESD"]}),
     "live_preview_content": OptionInfo("Combined", "Live preview subject", gr.Radio, {"choices": ["Combined", "Prompt", "Negative prompt"]}),
-    "live_preview_refresh_period": OptionInfo(250, "Progressbar/preview update period, in milliseconds", gr.Slider, {"minimum": 0, "maximum": 5000, "step": 25}),
+    "live_preview_refresh_period": OptionInfo(500, "Progressbar/preview update period, in milliseconds", gr.Slider, {"minimum": 0, "maximum": 5000, "step": 25}),
     "logmonitor_show": OptionInfo(True, "Show log view"),
     "logmonitor_refresh_period": OptionInfo(5000, "Log view update period, in milliseconds", gr.Slider, {"minimum": 0, "maximum": 30000, "step": 25}),
 }))
diff --git a/wiki b/wiki
index e5da783be..a132c4fcf 160000
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit e5da783bef6cacdb669c482d726e23a8d20d86d8
+Subproject commit a132c4fcffc88038614b8571acf9bd38df1a6c01