only set the gsettings image if there is no AS setting
commitd070482bf8d27ab3f051d4fa5febff08cc973550
authorMichael Zanetti <michael.zanetti@canonical.com>
dateTue 11 Nov 2014, 20:27 (12 years ago)
parent1e244ef
qml/Shell.qml+3−1
@@ -135,7 +135,9 @@ Item {
135135 }
136136 property url gSettingsPicture: backgroundSettings.pictureUri != undefined && backgroundSettings.pictureUri.length > 0 ? backgroundSettings.pictureUri : shell.defaultBackground
137137 onGSettingsPictureChanged: {
138− shell.background = gSettingsPicture
138+ if (AccountsService.backgroundFile == undefined || AccountsService.backgroundFile.length) {
139+ shell.background = gSettingsPicture
140+ }
139141 }
140142
141143 VolumeControl {