From d1745e4125c6fdda0f024a64a7c37e84d10f1fbd Mon Sep 17 00:00:00 2001
From: knalli <knallisworld@googlemail.com>
Date: Mon, 8 Sep 2014 14:51:16 +0200
Subject: [PATCH] fix(service): `$nextLang` should be not unset parallel
 loadings

resolves #647
---
 src/service/translate.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/service/translate.js b/src/service/translate.js
index 084447a19..a1738ece9 100644
--- a/src/service/translate.js
+++ b/src/service/translate.js
@@ -1455,12 +1455,14 @@ angular.module('pascalprecht.translate').provider('$translate', ['$STORAGE_KEY',
             translations(translation.key, translation.table);
             deferred.resolve(translation.key);
 
+            useLanguage(translation.key);
             if ($nextLang === key) {
-              useLanguage(translation.key);
               $nextLang = undefined;
             }
           }, function (key) {
-            $nextLang = undefined;
+            if ($nextLang === key) {
+              $nextLang = undefined;
+            }
             $rootScope.$emit('$translateChangeError', {language: key});
             deferred.reject(key);
             $rootScope.$emit('$translateChangeEnd', {language: key});