Synchronize changes from 1.6 master branch [ci skip]

github-actions[bot] · github-actions[bot] · commit 42d5194708d2 · 2025-06-23T17:53:40.000Z
6ce2c38 Wait for Discord RPC consent before showing new nickname prompt (PR #4260, Fixes #4258)
diff --git a/Client/core/CCore.cpp b/Client/core/CCore.cpp
@@ -1273,7 +1273,8 @@ void CCore::DoPostFramePulse()
             }
         }
 
-        if (m_menuFrame >= 75 && m_requestNewNickname && GetLocalGUI()->GetMainMenu()->IsVisible() && !GetLocalGUI()->GetMainMenu()->IsFading())
+        if (m_menuFrame >= 75 && m_requestNewNickname && GetLocalGUI()->GetMainMenu()->IsVisible() && !GetLocalGUI()->GetMainMenu()->IsFading() &&
+            !GetLocalGUI()->GetMainMenu()->GetQuestionWindow()->IsVisible())
         {
             // Request a new nickname if we're waiting for one
             GetLocalGUI()->GetMainMenu()->GetSettingsWindow()->RequestNewNickname();

Original file line number	Diff line number	Diff line change
`@@ -1273,7 +1273,8 @@ void CCore::DoPostFramePulse()`
`1273`	`1273`	`}`
`1274`	`1274`	`}`
`1275`	`1275`
`1276`		`- if (m_menuFrame >= 75 && m_requestNewNickname && GetLocalGUI()->GetMainMenu()->IsVisible() && !GetLocalGUI()->GetMainMenu()->IsFading())`
	`1276`	`+ if (m_menuFrame >= 75 && m_requestNewNickname && GetLocalGUI()->GetMainMenu()->IsVisible() && !GetLocalGUI()->GetMainMenu()->IsFading() &&`
	`1277`	`+ !GetLocalGUI()->GetMainMenu()->GetQuestionWindow()->IsVisible())`
`1277`	`1278`	`{`
`1278`	`1279`	`// Request a new nickname if we're waiting for one`
`1279`	`1280`	`GetLocalGUI()->GetMainMenu()->GetSettingsWindow()->RequestNewNickname();`