Merge branch 'staging' into redesign-extension-manager

c842c6f2384a64e2fcef354adbd6c536ad69bd07

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

2 files changed, +4 -3Showing whitespace changes
public/scripts/extensions/tts/alltalk.js+2 -2
@@ -262,13 +262,13 @@ class AllTalkTtsProvider {
262 console.debug('AllTalkTTS: Settings loaded');262 console.debug('AllTalkTTS: Settings loaded');
263 try {263 try {
264 // Check if TTS provider is ready264 // Check if TTS provider is ready
265 this.setupEventListeners();
266 this.updateLanguageDropdown();
265 await this.checkReady();267 await this.checkReady();
266 await this.updateSettingsFromServer(); // Fetch dynamic settings from the TTS server268 await this.updateSettingsFromServer(); // Fetch dynamic settings from the TTS server
267 await this.fetchTtsVoiceObjects(); // Fetch voices only if service is ready269 await this.fetchTtsVoiceObjects(); // Fetch voices only if service is ready
268 await this.fetchRvcVoiceObjects(); // Fetch RVC voices270 await this.fetchRvcVoiceObjects(); // Fetch RVC voices
269 this.updateNarratorVoicesDropdown();271 this.updateNarratorVoicesDropdown();
270 this.updateLanguageDropdown();
271 this.setupEventListeners();
272 this.applySettingsToHTML();272 this.applySettingsToHTML();
273 updateStatus('Ready');273 updateStatus('Ready');
274 } catch (error) {274 } catch (error) {
src/endpoints/characters.js+2 -1
@@ -158,7 +158,8 @@ async function tryReadImage(imgPath, crop) {
158 return image;158 return image;
159 }159 }
160 // If it's an unsupported type of image (APNG) - just read the file as buffer160 // If it's an unsupported type of image (APNG) - just read the file as buffer
161 catch {161 catch (error) {
162 console.log(`Failed to read image: ${imgPath}`, error);
162 return fs.readFileSync(imgPath);163 return fs.readFileSync(imgPath);
163 }164 }
164}165}