Merge branch 'staging' of https://github.com/SillyTavern/SillyTavern into staging

public/scripts/PromptManager.js

@@ -607,10 +607,6 @@ PromptManagerModule.prototype.init = function (moduleConfiguration, serviceSetti
     eventSource.on(event_types.OAI_PRESET_CHANGED, settings => {
         // Save configuration and wrap everything up.
         this.saveServiceSettings().then(() => {
-            this.hidePopup();
-            this.clearEditForm();
-            this.renderDebounced();
-
             const mainPrompt = this.getPromptById('main');
             this.updateQuickEdit('main', mainPrompt);
 
@@ -619,6 +615,10 @@ PromptManagerModule.prototype.init = function (moduleConfiguration, serviceSetti
 
             const jailbreakPrompt = this.getPromptById('jailbreak');
             this.updateQuickEdit('jailbreak', jailbreakPrompt);
+
+            this.hidePopup();
+            this.clearEditForm();
+            this.renderDebounced();
         });
     });
 

public/scripts/extensions/dice/style.css

@@ -1,26 +1,26 @@
-#roll_dice {
-    /* order: 100; */
-    /*     width: 40px;
-    height: 40px;
-    margin: 0;
-    padding: 1px; */
-    outline: none;
-    border: none;
-    cursor: pointer;
-    transition: 0.3s;
-    opacity: 0.7;
-    display: flex;
-    align-items: center;
-    /* justify-content: center; */
-
-}
-
-#roll_dice:hover {
-    opacity: 1;
-    filter: brightness(1.2);
-}
-
-#dice_dropdown {
-    z-index: 100;
-    backdrop-filter: blur(--SmartThemeBlurStrength);
-}
+#roll_dice {
+    /* order: 100; */
+    /*     width: 40px;
+    height: 40px;
+    margin: 0;
+    padding: 1px; */
+    outline: none;
+    border: none;
+    cursor: pointer;
+    transition: 0.3s;
+    opacity: 0.7;
+    display: flex;
+    align-items: center;
+    /* justify-content: center; */
+
+}
+
+#roll_dice:hover {
+    opacity: 1;
+    filter: brightness(1.2);
+}
+
+#dice_dropdown {
+    z-index: 30000;
+    backdrop-filter: blur(--SmartThemeBlurStrength);
+}

public/scripts/extensions/expressions/index.js

@@ -394,6 +394,11 @@ function onExpressionsShowDefaultInput() {
 }
 
 async function unloadLiveChar() {
+    if (!modules.includes('talkinghead')) {
+        console.debug('talkinghead module is disabled');
+        return;
+    }
+
     try {
         const url = new URL(getApiUrl());
         url.pathname = '/api/talkinghead/unload';