AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-17 11:15:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

moved config loading into the try-catch in which it was supposed to be in all along...

Browse Source
This commit is contained in:
Florian Nücke 2013-11-30 12:33:42 +01:00
parent b2b56419c9
commit e05a26c73d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
li/cil/oc/Settings.scala
View File

@ -150,13 +150,13 @@ object Settings {
out.close() out.close()
} }
val defaults = ConfigFactory.defaultReference().withOnlyPath("opencomputers") val defaults = ConfigFactory.defaultReference().withOnlyPath("opencomputers")
val config = ConfigFactory.parseFile(file).withFallback(defaults)
try { try {
val config = ConfigFactory.parseFile(file).withFallback(defaults)
settings = new Settings(config.getConfig("opencomputers")) settings = new Settings(config.getConfig("opencomputers"))
} }
catch { catch {
case e: Throwable => case e: Throwable =>
OpenComputers.log.log(Level.WARNING, "Failed loading config, using defaults.", e) OpenComputers.log.warning("Failed loading config, using defaults. The reason was: " + e.getMessage)
settings = new Settings(defaults.getConfig("opencomputers")) settings = new Settings(defaults.getConfig("opencomputers"))
} }
} }