diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-09-15 22:52:35 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-09-15 22:52:39 +0200 |
| commit | b9002d7fd5455ca2c13934748531b30a97799a9f (patch) | |
| tree | 09642f70f234a7aad727385fbdd75c2764966d40 /src/main/java/eu/siacs/conversations/entities/Conversation.java | |
| parent | b5719fd747a9a6d9757eccb0f20c22c2daaa9928 (diff) | |
added missing type='submit' to mam queries
fixed some nasty inheritance problems along the way
fixes #1411
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/Conversation.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Conversation.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java index 1af87c42..f4d116fe 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -340,8 +340,8 @@ public class Conversation extends AbstractEntity implements Blockable { if (getMode() == MODE_MULTI) { if (getMucOptions().getSubject() != null) { return getMucOptions().getSubject(); - } else if (bookmark != null && bookmark.getName() != null) { - return bookmark.getName(); + } else if (bookmark != null && bookmark.getBookmarkName() != null) { + return bookmark.getBookmarkName(); } else { String generatedName = getMucOptions().createNameFromParticipants(); if (generatedName != null) { |