From f1b9cdce929f290d15f508dc865e3840ef317a0b Mon Sep 17 00:00:00 2001
From: Simon Eisenmann <simon@struktur.de>
Date: Tue, 22 Jul 2014 12:39:20 +0200
Subject: [PATCH] Only reset userid on non soft events.

---
 static/js/controllers/mediastreamcontroller.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/static/js/controllers/mediastreamcontroller.js b/static/js/controllers/mediastreamcontroller.js
index 6d6569d1..53ee71a3 100644
--- a/static/js/controllers/mediastreamcontroller.js
+++ b/static/js/controllers/mediastreamcontroller.js
@@ -548,7 +548,10 @@ define(['underscore', 'bigscreen', 'moment', 'sjcl', 'modernizr', 'webrtc.adapte
 			var t = event.type;
 			var opts = $.extend({}, options);
 			$timeout.cancel(ttlTimeout);
-			$scope.userid = $scope.suserid = null;
+			if (!opts.soft) {
+				// Reset login information for anything not soft.
+				$scope.userid = $scope.suserid = null;
+			}
 			switch (t) {
 				case "open":
 					t = "waiting";