Merge branch 'master' into feature-calendarsync
This commit is contained in:
commit
f7ca1fc76c
|
@ -384,7 +384,9 @@ public class DBHelper {
|
||||||
} else {
|
} else {
|
||||||
ensureDeviceUpToDate(device, gbDevice, session);
|
ensureDeviceUpToDate(device, gbDevice, session);
|
||||||
}
|
}
|
||||||
ensureDeviceAttributes(device, gbDevice, session);
|
if (gbDevice.isInitialized()) {
|
||||||
|
ensureDeviceAttributes(device, gbDevice, session);
|
||||||
|
}
|
||||||
|
|
||||||
return device;
|
return device;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue