Merge remote-tracking branch 'origin/master'

Conflicts:
	resources/lib/LibrarySync.py
This commit is contained in:
shaun 2015-08-02 19:23:54 +10:00
commit c3e2d88784
1 changed files with 3 additions and 3 deletions

View File

@ -63,8 +63,8 @@ class LibrarySync(threading.Thread):
startupDone = WINDOW.getProperty("startup") == "done"
syncInstallRunDone = addon.getSetting("SyncInstallRunDone") == "true"
performMusicSync = addon.getSetting("enableMusicSync") == "true"
dbSyncIndication = addon.getSetting("dbSyncIndication") == "true"
dbSyncIndication = addon.getSetting("dbSyncIndication") == "true"
### BUILD VIDEO NODES LISTING ###
VideoNodes().buildVideoNodesListing()
### CREATE SOURCES ###
@ -72,7 +72,7 @@ class LibrarySync(threading.Thread):
# Only create sources once
self.logMsg("Sources.xml created.", 0)
utils.createSources()
addon.setSetting("Sources", "true")
addon.setSetting("Sources", "true")
# just do a incremental sync if that is what is required
if(addon.getSetting("useIncSync") == "true" and addon.getSetting("SyncInstallRunDone") == "true"):