[Pkg-owncloud-commits] [owncloud-client] 52/171: Ensure Qt translator does always get loaded.

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to annotated tag upstream/2.1.1+dfsg
in repository owncloud-client.

commit 5487fc1f9cfa3091e3dc60fbb8a31f7ca1723d3c
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Mon Jan 4 11:47:11 2016 +0100

    Ensure Qt translator does always get loaded.
---
 src/gui/application.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index 7f56379..0124829 100644
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -545,7 +545,9 @@ void Application::setupTranslations()
             const QString qtBaseTrFile = QLatin1String("qtbase_") + lang;
             if (!qtTranslator->load(qtTrFile, qtTrPath)) {
                 if (!qtTranslator->load(qtTrFile, trPath)) {
-                    qtTranslator->load(qtBaseTrFile, trPath);
+                    if (!qtTranslator->load(qtBaseTrFile, qtTrPath)) {
+                        qtTranslator->load(qtBaseTrFile, trPath);
+                    }
                 }
             }
             const QString qtkeychainTrFile = QLatin1String("qtkeychain_") + lang;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git