artin/EmulatorJS
1
0
Fork 0
mirror of https://github.com/EmulatorJS/EmulatorJS.git synced 2026-02-06 11:17:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix default webgl2 option

Browse Source
This commit is contained in:
Ethan O'Brien 2024-12-10 07:37:36 -06:00
parent a8d0284e06
commit c0ae2e2caf
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
data/src/emulator.js
View File

@ -555,7 +555,7 @@ class EmulatorJS {
}
const report = "cores/reports/" + this.getCore() + ".json";
this.downloadFile(report, (rep) => {
if (rep === -1 || typeof report === "string") {
if (rep === -1 || typeof rep === "string") {
rep = {};
} else {
rep = rep.data;
@ -3832,7 +3832,7 @@ class EmulatorJS {
};
}
saveSettings() {
if (!window.localStorage || this.config.disableLocalStorage || !this.settingsLoaded) return;
if (!window.localStorage || this.config.disableLocalStorage || !this.settingsLoaded || !this.started) return;
const coreSpecific = {
controlSettings: this.controls,
settings: this.settings,
@ -3846,23 +3846,22 @@ class EmulatorJS {
localStorage.setItem("ejs-"+this.getCore()+"-settings", JSON.stringify(coreSpecific));
}
preGetSetting(setting) {
if (!window.localStorage || this.config.disableLocalStorage) {
if (this.config.defaultOptions && this.config.defaultOptions[setting]) {
return this.config.defaultOptions[setting];
if (window.localStorage && !this.config.disableLocalStorage) {
let coreSpecific = localStorage.getItem("ejs-"+this.getCore()+"-settings");
try {
coreSpecific = JSON.parse(coreSpecific);
if (!coreSpecific || !coreSpecific.settings) {
return false;
}
return coreSpecific.settings[setting];
} catch (e) {
console.warn("Could not load previous settings", e);
}
return false;
}
let coreSpecific = localStorage.getItem("ejs-"+this.getCore()+"-settings");
try {
coreSpecific = JSON.parse(coreSpecific);
if (!coreSpecific || !coreSpecific.settings) {
return false;
}
return coreSpecific.settings[setting];
} catch (e) {
console.warn("Could not load previous settings", e);
return false;
if (this.config.defaultOptions && this.config.defaultOptions[setting]) {
return this.config.defaultOptions[setting];
}
return false;
}
loadSettings() {
if (!window.localStorage || this.config.disableLocalStorage) return;
@ -3908,16 +3907,11 @@ class EmulatorJS {
}
}
}
menuOptionChanged(option, value) {
this.saveSettings();
if (this.debug) console.log(option, value);
if (!this.gameManager) return;
handleSpecialOptions(option, value) {
if (option === "shader") {
this.enableShader(value);
return;
} else if (option === "disk") {
this.gameManager.setCurrentDisk(value);
return;
} else if (option === "virtual-gamepad") {
this.toggleVirtualGamepad(value !== "disabled");
} else if (option === "virtual-gamepad-left-handed-mode") {
@ -3961,6 +3955,12 @@ class EmulatorJS {
} else if (option === "vsync") {
this.gameManager.setVSync(value === "enabled");
}
}
menuOptionChanged(option, value) {
this.saveSettings();
if (this.debug) console.log(option, value);
if (!this.gameManager) return;
this.handleSpecialOptions(option, value);
this.gameManager.setVariable(option, value);
this.saveSettings();
}