From 4864f7200bbdb3e8d45eb7f165d62274f19e2e7b Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel.gultsch@rwth-aachen.de>
Date: Thu, 27 Mar 2014 02:02:59 +0100
Subject: fixed a couple of muc issues. added jingle listener (which doesn't do
 anything for now)

---
 src/eu/siacs/conversations/entities/Conversation.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/eu/siacs/conversations/entities/Conversation.java')

diff --git a/src/eu/siacs/conversations/entities/Conversation.java b/src/eu/siacs/conversations/entities/Conversation.java
index 79757f1e..f8c6a2a6 100644
--- a/src/eu/siacs/conversations/entities/Conversation.java
+++ b/src/eu/siacs/conversations/entities/Conversation.java
@@ -293,7 +293,7 @@ public class Conversation extends AbstractEntity {
 		return this.otrFingerprint;
 	}
 
-	public MucOptions getMucOptions() {
+	public synchronized MucOptions getMucOptions() {
 		if (this.mucOptions == null) {
 			this.mucOptions = new MucOptions();
 		}
-- 
cgit v1.2.3