Merge branch 'master' into feature-calendarsync

2017-04-16 19:59:23 +02:00 · 2017-04-16 19:59:23 +02:00 · f7ca1fc76c
parent 9970f8017f 67f035accf
commit f7ca1fc76c
1 changed files with 3 additions and 1 deletions
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHelper.java
@ -384,7 +384,9 @@ public class DBHelper {
        } else {
            ensureDeviceUpToDate(device, gbDevice, session);
        }
-        ensureDeviceAttributes(device, gbDevice, session);
+        if (gbDevice.isInitialized()) {
+            ensureDeviceAttributes(device, gbDevice, session);
+        }

        return device;
    }