From 18acabec7bcf90749cbb1ddcbd58ce3185819772 Mon Sep 17 00:00:00 2001 From: Philippe Lelong Date: Wed, 21 Dec 2016 15:26:33 +0100 Subject: Fix language when user logs out Signed-off-by: Philippe Lelong --- HomeScreen/src2/applicationmodel.cpp | 4 ++++ HomeScreen/src2/usermanagement.cpp | 1 + 2 files changed, 5 insertions(+) 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(); -- cgit 1.2.3-korg