forked from mia/Aegisub
Catch all exceptions when deciding whether to load the default config.
Originally committed to SVN as r5136.
This commit is contained in:
parent
0d7b2c6e76
commit
319ac2d4bb
1 changed files with 1 additions and 1 deletions
|
@ -78,7 +78,7 @@ Hotkey::Hotkey(const std::string &file, const std::string &default_config):
|
||||||
json::UnknownElement hotkey_root;
|
json::UnknownElement hotkey_root;
|
||||||
try {
|
try {
|
||||||
hotkey_root = agi::json_util::parse(stream);
|
hotkey_root = agi::json_util::parse(stream);
|
||||||
} catch (json::Reader::ParseException& e) {
|
} catch (...) {
|
||||||
// There's definatly a better way to do this.
|
// There's definatly a better way to do this.
|
||||||
std::istringstream *stream = new std::istringstream(config_default);
|
std::istringstream *stream = new std::istringstream(config_default);
|
||||||
hotkey_root = agi::json_util::parse(stream);
|
hotkey_root = agi::json_util::parse(stream);
|
||||||
|
|
Loading…
Reference in a new issue