rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' into qr-rewrite

This commit is contained in:
LenAnderson 2023-12-24 15:10:05 +00:00
parent 881a8e570f a9e074dae1
commit e147b2bd23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/script.js
View File

@ -2974,9 +2974,11 @@ async function Generate(type, { automatic_trigger, force_name2, quiet_prompt, qu
return Promise.resolve(); return Promise.resolve();
} }
// Hide swipes if not in a dry run.
if (!dryRun) { if (!dryRun) {
// Hide swipes if not in a dry run.
hideSwipeButtons(); hideSwipeButtons();
// If generated any message, set the flag to indicate it can't be recreated again.
chat_metadata['tainted'] = true;
} }
if (selected_group && !is_group_generating && !dryRun) { if (selected_group && !is_group_generating && !dryRun) {
@ -7105,7 +7107,8 @@ async function createOrEditCharacter(e) {
crop_data = undefined; crop_data = undefined;
eventSource.emit(event_types.CHARACTER_EDITED, { detail: { id: this_chid, character: characters[this_chid] } }); eventSource.emit(event_types.CHARACTER_EDITED, { detail: { id: this_chid, character: characters[this_chid] } });
if (chat.length === 1 && !selected_group) { // Recreate the chat if it hasn't been used at least once (i.e. with continue).
if (chat.length === 1 && !selected_group && !chat_metadata['tainted']) {
const firstMessage = getFirstMessage(); const firstMessage = getFirstMessage();
chat[0] = firstMessage; chat[0] = firstMessage;