Fix editing same message many times. Fixes #195

tulir · Aug 30, 2020 · db4aa77 · db4aa77
1 parent d9407ee
commit db4aa77
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/ui/room-view.go b/ui/room-view.go
@@ -436,8 +436,13 @@ func (view *RoomView) SetEditing(evt *muksevt.Event) {
  view.editing = evt
  // replying should never be non-nil when SetEditing, but do this just to be safe
  view.replying = nil
- text := view.editing.Content.AsMessage().Body
- if view.editing.Content.AsMessage().MsgType == event.MsgEmote {
+ msgContent := view.editing.Content.AsMessage()
+ if len(view.editing.Gomuks.Edits) > 0 {
+ // This feels kind of dangerous, but I think it works
+ msgContent = view.editing.Gomuks.Edits[len(view.editing.Gomuks.Edits)-1].Content.AsMessage().NewContent
+ }
+ text := msgContent.Body
+ if msgContent.MsgType == event.MsgEmote {
  text = "/me " + text
  }
  view.input.SetText(text)