From 05dbd4459d8752d0e164437372be0faa792a972c Mon Sep 17 00:00:00 2001
From: Simon Eisenmann <simon@struktur.de>
Date: Wed, 21 May 2014 14:06:25 +0200
Subject: [PATCH] Fixed auto open of settings when no displayName is set.

---
 static/js/controllers/mediastreamcontroller.js | 2 +-
 static/js/directives/usability.js              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/static/js/controllers/mediastreamcontroller.js b/static/js/controllers/mediastreamcontroller.js
index 277ab654..1b8a83bd 100644
--- a/static/js/controllers/mediastreamcontroller.js
+++ b/static/js/controllers/mediastreamcontroller.js
@@ -352,7 +352,7 @@ define(['underscore', 'bigscreen', 'moment', 'sjcl', 'webrtc.adapter'], function
             $scope.user = $.extend(true, {}, $scope.master, storedUser);
             $scope.user.settings = $.extend(true, {}, $scope.user.settings, $scope.master.settings, $scope.user.settings);
             $scope.update($scope.user, true);
-            $scope.loadedUser = true;
+            $scope.loadedUser = storedUser.displayName && true;
             // Add room definition to root to be availale on initial connect.
             $rootScope.roomid = $scope.user.settings.defaultRoom || "";
         }
diff --git a/static/js/directives/usability.js b/static/js/directives/usability.js
index 04bda034..eb8f29d1 100644
--- a/static/js/directives/usability.js
+++ b/static/js/directives/usability.js
@@ -53,7 +53,7 @@ define(['jquery', 'underscore', 'text!partials/usability.html'], function($, _,
             ctrl.setInfo("denied");
           }
           // Check if we should show settings per default.
-          $scope.$parent.showSettings = $scope.loadedUser ? 0 : 1;
+          $scope.layout.settings = $scope.loadedUser ? false : true;
         });
       };