Fixed flicker of welcome screen.

Only auto show settings when in a room.

static/js/directives/page.js

@@ -20,7 +20,7 @@
  */
 define(['text!partials/page.html', 'text!partials/page/welcome.html'], function(template, welcome) {
 
-	return ["$templateCache", function($templateCache) {
+	return ["$templateCache", "mediaStream", function($templateCache, mediaStream) {
 
 		$templateCache.put('page/welcome.html', welcome);
 
@@ -29,6 +29,8 @@ define(['text!partials/page.html', 'text!partials/page/welcome.html'], function(
 			scope.room = false;
 			scope.page = null;
 
+			if (mediaStream.config.DefaultRoomEnabled !== true) {
+
 				scope.$on("welcome", function() {
 					if (!scope.initialized) {
 						scope.initialized = true;
@@ -56,6 +58,8 @@ define(['text!partials/page.html', 'text!partials/page/welcome.html'], function(
 					}
 				};
 
+			}
+
 		};
 
 		return {

static/js/directives/usability.js

@@ -29,7 +29,7 @@ define(['jquery', 'underscore', 'text!partials/usability.html'], function($, _,
 			var pending = true;
 			var complete = false;
 
-			var initalizer = null;
+			var initializer = null;
 
 			var ctrl = this;
 			ctrl.setInfo = function(info) {
@@ -43,17 +43,20 @@ define(['jquery', 'underscore', 'text!partials/usability.html'], function($, _,
 					if (status) {
 						localStorage.setItem("mediastream-mediacheck", MEDIA_CHECK)
 						$scope.connect()
+						if (mediaStream.config.DefaultRoomEnabled !== true) {
 							ctrl.setInfo("initializing");
 							initializer = $timeout(function() {
 								ctrl.setInfo("ok");
+								$scope.layout.settings = false;
 								$scope.$emit("welcome");
 							}, 1000);
+						} else {
+							ctrl.setInfo("ok");
+						}
 						complete = true;
 					} else {
 						ctrl.setInfo("denied");
 					}
-					// Check if we should show settings per default.
-					$scope.layout.settings = $scope.loadedUser ? false : true;
 				});
 			};
 
@@ -98,6 +101,8 @@ define(['jquery', 'underscore', 'text!partials/usability.html'], function($, _,
 						$timeout.cancel(initializer);
 						initializer = null;
 					}
+					// Check if we should show settings per default when in a room.
+					$scope.layout.settings = $scope.loadedUser ? false : true;
 					ctrl.setInfo("ok");
 				}
 			});