diff --git a/static/js/controllers/mediastreamcontroller.js b/static/js/controllers/mediastreamcontroller.js index e9aa3995..cd62c58d 100644 --- a/static/js/controllers/mediastreamcontroller.js +++ b/static/js/controllers/mediastreamcontroller.js @@ -459,6 +459,9 @@ define(['underscore', 'bigscreen', 'moment', 'sjcl', 'modernizr', 'webrtc.adapte // Unmark authorization process. if (data.Userid) { mediaStream.users.authorizing(false); + } else if (!mediaStream.users.authorizing()) { + // Trigger user data load when not in authorizing phase. + $scope.loadUserSettings(); } // Always apply room after self received to avoid double stuff. diff --git a/static/js/services/mediastream.js b/static/js/services/mediastream.js index fca50a74..58a96488 100644 --- a/static/js/services/mediastream.js +++ b/static/js/services/mediastream.js @@ -137,7 +137,10 @@ define([ }, authorizing: function(value) { // Boolean flag to indicate that an authentication is currently in progress. - authorizing = !!value; + if (typeof(value) !== "undefined") { + authorizing = !!value; + } + return authorizing; }, authorize: function(data, success_cb, error_cb) { mediaStream.users.authorizing(true);