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)
99
99
{
100
100
Author = null ,
101
101
ComposedTimestamp = now ,
102
- ExpiresAt = SelectedConversation . ExpiresInSeconds ,
102
+ ExpiresAt = SelectedThread . ExpiresInSeconds ,
103
103
Content = new SignalMessageContent ( ) { Content = messageText } ,
104
104
ThreadId = SelectedThread . ThreadId ,
105
105
ReceivedTimestamp = now ,
@@ -131,10 +131,14 @@ internal void RepositionConversation(SignalConversation uiConversation)
131
131
}
132
132
if ( uiConversation . LastActiveTimestamp > c . LastActiveTimestamp )
133
133
{
134
+ var oldSelectedConversation = SelectedConversation ;
134
135
int index = Conversations . IndexOf ( uiConversation ) ;
135
136
Logger . LogDebug ( "RepositionConversation() moving conversation from {0} to {1}" , index , i ) ;
136
137
Conversations . Move ( index , i ) ;
137
- SelectedConversation = uiConversation ;
138
+ if ( oldSelectedConversation == uiConversation )
139
+ {
140
+ SelectedConversation = uiConversation ;
141
+ }
138
142
break ;
139
143
}
140
144
}
You can’t perform that action at this time.
0 commit comments