File tree Expand file tree Collapse file tree 1 file changed +6
-2
lines changed
Signal-Windows/ViewModels Expand file tree Collapse file tree 1 file changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -99,7 +99,7 @@ private async Task<bool> SendMessage(string messageText)
9999 {
100100 Author = null ,
101101 ComposedTimestamp = now ,
102- ExpiresAt = SelectedConversation . ExpiresInSeconds ,
102+ ExpiresAt = SelectedThread . ExpiresInSeconds ,
103103 Content = new SignalMessageContent ( ) { Content = messageText } ,
104104 ThreadId = SelectedThread . ThreadId ,
105105 ReceivedTimestamp = now ,
@@ -131,10 +131,14 @@ internal void RepositionConversation(SignalConversation uiConversation)
131131 }
132132 if ( uiConversation . LastActiveTimestamp > c . LastActiveTimestamp )
133133 {
134+ var oldSelectedConversation = SelectedConversation ;
134135 int index = Conversations . IndexOf ( uiConversation ) ;
135136 Logger . LogDebug ( "RepositionConversation() moving conversation from {0} to {1}" , index , i ) ;
136137 Conversations . Move ( index , i ) ;
137- SelectedConversation = uiConversation ;
138+ if ( oldSelectedConversation == uiConversation )
139+ {
140+ SelectedConversation = uiConversation ;
141+ }
138142 break ;
139143 }
140144 }
You can’t perform that action at this time.
0 commit comments