diff options
| author | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-03-27 02:02:59 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-03-27 02:02:59 +0100 |
| commit | 4864f7200bbdb3e8d45eb7f165d62274f19e2e7b (patch) | |
| tree | 54da6eeef9f9114dfb9e89c4342bdcee266414e2 /src/eu/siacs/conversations/entities/Conversation.java | |
| parent | f4c9c19ec0f50fa7a80f4aa7dd28269335188f55 (diff) | |
fixed a couple of muc issues. added jingle listener (which doesn't do anything for now)
Diffstat (limited to 'src/eu/siacs/conversations/entities/Conversation.java')
| -rw-r--r-- | src/eu/siacs/conversations/entities/Conversation.java | 2 |
1 files changed, 1 insertions, 1 deletions
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(); } |