From cacbc6e1fd55d721beb334cd374b0e5e68e88e22 Mon Sep 17 00:00:00 2001 From: Obique PSWG Date: Tue, 17 May 2016 14:47:56 -0500 Subject: [PATCH] Added file exists check to the object manager to prevent fatal error --- src/services/objects/ObjectManager.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/services/objects/ObjectManager.java b/src/services/objects/ObjectManager.java index 435d0a12..a793e504 100644 --- a/src/services/objects/ObjectManager.java +++ b/src/services/objects/ObjectManager.java @@ -113,9 +113,11 @@ public class ObjectManager extends Manager { long startLoad = System.nanoTime(); Log.i("ObjectManager", "Loading objects from ObjectDatabase..."); synchronized (database) { - if (!database.load()) - return false; - database.traverse((obj) -> loadObject(obj)); + if (database.fileExists()) { + if (!database.load()) + return false; + database.traverse((obj) -> loadObject(obj)); + } } double loadTime = (System.nanoTime() - startLoad) / 1E6; Log.i("ObjectManager", "Finished loading %d objects. Time: %fms", database.size(), loadTime);