jab2870/Vim-Vixen
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix undefined checking on operation parameter

Browse source
This commit is contained in:
Shin'ya Ueoka 2019-08-27 22:33:33 +09:00
parent 52e7a3aa11
commit 04c077d614
2 changed files with 29 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/background/usecases/SettingUseCase.ts
View file

@ -21,7 +21,12 @@ export default class SettingUseCase {
}
async reload(): Promise<Settings> {
let data = await this.persistentSettingRepository.load();
let data;
try {
data = await this.persistentSettingRepository.load();
} catch (e) {
this.showUnableToLoad(e);
}
if (!data) {
data = DefaultSettingData;
}
@ -30,12 +35,17 @@ export default class SettingUseCase {
try {
value = data.toSettings();
} catch (e) {
this.notifyPresenter.notifyInvalidSettings(() => {
browser.runtime.openOptionsPage();
});
this.showUnableToLoad(e);
value = DefaultSettingData.toSettings();
}
this.settingRepository.update(value!!);
return value;
}
private showUnableToLoad(e: Error) {
console.error('unable to load settings', e);
this.notifyPresenter.notifyInvalidSettings(() => {
browser.runtime.openOptionsPage();
});
}
}