From 0666d80add037327cc6b1b6598ea3ad4a97620a6 Mon Sep 17 00:00:00 2001
From: brantje <brantje@gmail.com>
Date: Wed, 11 Jan 2017 21:45:14 +0100
Subject: [PATCH] Fix for vault settings not loaded

---
 js/app/controllers/vault.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/js/app/controllers/vault.js b/js/app/controllers/vault.js
index 08b3f7ca..6dba1c69 100644
--- a/js/app/controllers/vault.js
+++ b/js/app/controllers/vault.js
@@ -72,13 +72,20 @@
 			$scope.list_selected_vault = false;
 			$scope.minimal_value_key_strength = 3;
 
-			$rootScope.$on('settings_loaded', function () {
+			var settingsLoaded = function () {
 				$scope.minimal_value_key_strength = SettingsService.getSetting('vault_key_strength');
 				$translate(key_strengths[SettingsService.getSetting('vault_key_strength')]).then(function(translation){
 					$scope.required_score = {'strength': translation};
 				});
+			};
 
-			});
+			if(!SettingsService.getSetting('settings_loaded')){
+				$rootScope.$on('settings_loaded', function () {
+					settingsLoaded();
+				});
+			} else {
+				settingsLoaded();
+			}
 
 			$scope.toggleDefaultVault = function () {
 				$scope.default_vault = !$scope.default_vault;