aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilippe Lelong <lelong.ph@meltemus.com>2016-12-21 15:26:33 +0100
committerPhilippe Lelong <lelong.ph@meltemus.com>2016-12-21 15:26:33 +0100
commit18acabec7bcf90749cbb1ddcbd58ce3185819772 (patch)
tree5fcfe59379cfb915be5116ab7641068ebff50855
parentbd8c66edaa148de75d96abe25c2a3814ea85e78e (diff)
Fix language when user logs outsandbox/maitai/forgerock5
Signed-off-by: Philippe Lelong <lelong.ph@meltemus.com>
-rw-r--r--HomeScreen/src2/applicationmodel.cpp4
-rw-r--r--HomeScreen/src2/usermanagement.cpp1
2 files changed, 5 insertions, 0 deletions
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<int> o = d->orders.at(order);
QList<AppInfo> 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();