git.iko.soy/unity8
on xenial help sign in
only set the gsettings image if there is no AS setting
d070482Michael Zanetti
qml/Shell.qml+3−1
compare with xenial
unifiedsplit
@@ -135,7 +135,9 @@ Item {
135 }
135 }
136 property url gSettingsPicture: backgroundSettings.pictureUri != undefined && backgroundSettings.pictureUri.length > 0 ? backgroundSettings.pictureUri : shell.defaultBackground
136 property url gSettingsPicture: backgroundSettings.pictureUri != undefined && backgroundSettings.pictureUri.length > 0 ? backgroundSettings.pictureUri : shell.defaultBackground
137 onGSettingsPictureChanged: {
137 onGSettingsPictureChanged: {
138+ if (AccountsService.backgroundFile == undefined || AccountsService.backgroundFile.length) {
138− shell.background = gSettingsPicture
139+ shell.background = gSettingsPicture
140+ }
139 }
141 }
140
142
141 VolumeControl {
143 VolumeControl {