From: Philippe Lelong Date: Wed, 21 Dec 2016 14:26:33 +0000 (+0100) Subject: Fix language when user logs out X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=113977cd22d48320a9c10ea579634354c13675cb;hp=8e3b7812070453c3b7071fc3c517268ca37b49ef;p=staging%2FHomeScreen.git Fix language when user logs out Signed-off-by: Philippe Lelong --- diff --git a/HomeScreen/src2/applicationmodel.cpp b/HomeScreen/src2/applicationmodel.cpp index ff7276e..ab93b6f 100644 --- a/HomeScreen/src2/applicationmodel.cpp +++ b/HomeScreen/src2/applicationmodel.cpp @@ -74,6 +74,10 @@ ApplicationModel::Private::Private(ApplicationModel *parent) } void ApplicationModel::changeOrder(const int &hash) { + if(hash < 0) { + d->data = d->originalData; + return; + } int order = qAbs(hash) % 7; QList o = d->orders.at(order); QList newData; diff --git a/HomeScreen/src2/usermanagement.cpp b/HomeScreen/src2/usermanagement.cpp index 49a1fdc..b4f7221 100644 --- a/HomeScreen/src2/usermanagement.cpp +++ b/HomeScreen/src2/usermanagement.cpp @@ -28,6 +28,7 @@ UserManagement::UserManagement(QObject *root) : QObject() } void UserManagement::slot_disconnect() { + appModel->changeLanguage("us"); appModel->changeOrder(-1); timerRed.stop(); slot_turnOffRed();