Merge pull request #2826 from SillyTavern/fix-ask Fix restoration of current character after /ask

ac03cbb0ab12c74f603adb342bb33287c0d8a5b4

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed

public/scripts/slash-commands.js+9 -8 Viewed

             lastMessage.force_avatar = force_avatar;
             lastMessage.original_avatar = original_avatar;
+        }
+-
 -        // Kill this callback once the event fires
 -        eventSource.removeListener(event_types.CHARACTER_MESSAGE_RENDERED, restoreCharacter);
     };
     // Run generate and restore previous character on error
     try {
         toastr.info(`Asking ${character.name} something...`);
         await Generate('ask_command');
 -    } catch {
 +        await saveChatConditional();
 +    } catch (error) {
 +        console.error('Error running /ask command', error);
 +    } finally {
         restoreCharacter();
++
 +        if (this_chid !== prevChId) {
 +            toastr.error('It is strongly recommended to reload the page.', 'Something went wrong');
 +        }
+    }
 -    // Restore previous character once message renders
 -    // Hack for generate
 -    eventSource.on(event_types.CHARACTER_MESSAGE_RENDERED, restoreCharacter);
     return '';
+}