* Fix redraw bug where loading message isn't cleared in empty channels.

DiscordMessenger · May 16, 2024 · b6dd834 · b6dd834
1 parent 2e9b30c
commit b6dd834
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/discord/DiscordInstance.cpp b/src/discord/DiscordInstance.cpp
@@ -117,6 +117,8 @@ void DiscordInstance::OnSelectChannel(Snowflake sf, bool bSendSubscriptionUpdate
 	m_channelHistory.AddToHistory(m_CurrentChannel);
 	m_CurrentChannel = sf;
 
+	pGuild->m_currentChannel = m_CurrentChannel;
+
 	GetFrontend()->UpdateSelectedChannel();
 
 	if (!GetCurrentChannel() || !GetCurrentGuild())

diff --git a/src/windows/MessageList.cpp b/src/windows/MessageList.cpp
@@ -765,16 +765,13 @@ void MessageList::RefetchMessages(Snowflake gapCulprit)
 	std::set<Snowflake> usersToLoad;
 
 	uint64_t ts = GetTimeUs();
-	if (gapCulprit)
+	for (auto iter = m_messages.begin(); iter != m_messages.end(); ++iter)
 	{
-		for (auto iter = m_messages.begin(); iter != m_messages.end(); ++iter)
+		if (gapCulprit == iter->m_msg.m_snowflake)
 		{
-			if (gapCulprit == iter->m_msg.m_snowflake)
-			{
-				updateRect = iter->m_rect;
-				haveUpdateRect = true;
-				break;
-			}
+			updateRect = iter->m_rect;
+			haveUpdateRect = true;
+			break;
 		}
 	}