From b114dbaf01feb1573832c8d33d2031e5c6c9af44 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Thu, 23 Apr 2015 11:22:48 -0700
Subject: [PATCH] GUAC-1053: Ensure new preferences are set even if the user
 already had preferences from an older version.

---
 .../src/main/webapp/app/settings/services/preferenceService.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guacamole/src/main/webapp/app/settings/services/preferenceService.js b/guacamole/src/main/webapp/app/settings/services/preferenceService.js
index e1da5a44d..769d43faa 100644
--- a/guacamole/src/main/webapp/app/settings/services/preferenceService.js
+++ b/guacamole/src/main/webapp/app/settings/services/preferenceService.js
@@ -127,7 +127,7 @@ angular.module('settings').factory('preferenceService', ['$injector',
         if (localStorage) {
             var preferencesJSON = localStorage.getItem(GUAC_PREFERENCES_STORAGE_KEY);
             if (preferencesJSON)
-                service.preferences = JSON.parse(preferencesJSON);
+                angular.extend(service.preferences, JSON.parse(preferencesJSON));
         }
 
     }