From 77f161cc49c262e27e76ee1fab34de438f78305c Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Mon, 15 May 2017 11:40:01 +0200
Subject: [PATCH] Use message object directly instead of buggy lookup

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
---
 js/views/messagesview.js | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/js/views/messagesview.js b/js/views/messagesview.js
index 31c795646..f65d56688 100644
--- a/js/views/messagesview.js
+++ b/js/views/messagesview.js
@@ -96,21 +96,13 @@ define(function(require) {
 		 * @param {Message} message
 		 */
 		setActiveMessage: function(message) {
-			var oldMessage = null;
 			if (this.currentMessage !== null) {
-				// TODO: make sure objects exist only once and compare references instead
-				oldMessage = this.collection.get(this.currentMessage.get('id'));
-				if (oldMessage) {
-					oldMessage.set('active', false);
-				}
+				this.currentMessage.set('active', false);
 			}
 
 			this.currentMessage = message;
 			if (message !== null) {
-				message = this.collection.get(this.currentMessage);
-				if (message) {
-					message.set('active', true);
-				}
+				message.set('active', true);
 			}
 
 			require('state').currentMessage = message;
-- 
GitLab