git.iko.soy/unity8
on xenial help sign in
Don't crash if we only ever set an empty username in our mock libusermetrics
44a26d2Michael Terry
Greeter/GreeterContent.qml+1−1
compare with xenial
unifiedsplit
@@ -146,7 +146,7 @@ MouseArea {
146 Component.onCompleted: {
146 Component.onCompleted: {
147 selectedUser = greeterContentLoader.model.data(greeterContentLoader.currentIndex, LightDM.UserRoles.NameRole)
147 selectedUser = greeterContentLoader.model.data(greeterContentLoader.currentIndex, LightDM.UserRoles.NameRole)
148 greeterContentLoader.infographicModel.username = infographicUser
148 greeterContentLoader.infographicModel.username = infographicUser
149− greeterContentLoader.infographicModel.readyForDataChangeSlot()
149+ greeterContentLoader.infographicModel.readyForDataChange()
150 }
150 }
151
151
152 Connections {
152 Connections {
tests/mocks/libusermetrics/UserMetrics.cpp+1−1
@@ -228,7 +228,7 @@ UserMetricsPrivate::~UserMetricsPrivate()
228
228
229void UserMetricsPrivate::setUsername(const QString &username)
229void UserMetricsPrivate::setUsername(const QString &username)
230{
230{
231− if (m_username == username) {
231+ if (m_username == username && m_newData) {
232 return;
232 return;
233 }
233 }
234
234