R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

ImGui: fix server modal token input bug

Browse Source 
The string buffer was moved to the stack on a recent refactor, but the data must persist even outside the function scope. Moved back to class in form of a buffer.
This commit is contained in:
Kawe Mazidjatari 2024-04-17 21:18:51 +02:00
parent afb53b899c
commit 535d2cdfba
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
r5dev/gameui/IBrowser.cpp
View File

@ -52,6 +52,7 @@ CBrowser::CBrowser(void)
{ {
m_surfaceLabel = "Server Browser"; m_surfaceLabel = "Server Browser";
memset(m_serverTokenTextBuf, '\0', sizeof(m_serverTokenTextBuf));
memset(m_serverAddressTextBuf, '\0', sizeof(m_serverAddressTextBuf)); memset(m_serverAddressTextBuf, '\0', sizeof(m_serverAddressTextBuf));
memset(m_serverNetKeyTextBuf, '\0', sizeof(m_serverNetKeyTextBuf)); memset(m_serverNetKeyTextBuf, '\0', sizeof(m_serverNetKeyTextBuf));
@ -343,10 +344,10 @@ void CBrowser::DrawBrowserPanel(void)
ImGui::PushItemWidth(itemWidth); ImGui::PushItemWidth(itemWidth);
{ {
ImGui::InputTextWithHint("##ServerBrowser_ServerCon", "Server address and port", m_serverAddressTextBuf, IM_ARRAYSIZE(m_serverAddressTextBuf)); ImGui::InputTextWithHint("##ServerBrowser_ServerCon", "Server address and port", m_serverAddressTextBuf, sizeof(m_serverAddressTextBuf));
ImGui::SameLine(); ImGui::SameLine();
ImGui::InputTextWithHint("##ServerBrowser_ServerKey", "Encryption key", m_serverNetKeyTextBuf, IM_ARRAYSIZE(m_serverNetKeyTextBuf)); ImGui::InputTextWithHint("##ServerBrowser_ServerKey", "Encryption key", m_serverNetKeyTextBuf, sizeof(m_serverNetKeyTextBuf));
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::Button("Connect", ImVec2(itemWidth, ImGui::GetFrameHeight()))) if (ImGui::Button("Connect", ImVec2(itemWidth, ImGui::GetFrameHeight())))
@ -437,8 +438,8 @@ void CBrowser::HiddenServersModal(void)
const ImVec2 contentRegionMax = ImGui::GetContentRegionAvail(); const ImVec2 contentRegionMax = ImGui::GetContentRegionAvail();
ImGui::PushItemWidth(contentRegionMax.x); // Override item width. ImGui::PushItemWidth(contentRegionMax.x); // Override item width.
string hiddenServerToken; ImGui::InputTextWithHint("##HiddenServersConnectModal_TokenInput", "Token (required)",
ImGui::InputTextWithHint("##HiddenServersConnectModal_TokenInput", "Token (required)", &hiddenServerToken); m_serverTokenTextBuf, sizeof(m_serverTokenTextBuf));
ImGui::PopItemWidth(); ImGui::PopItemWidth();
@ -458,10 +459,10 @@ void CBrowser::HiddenServersModal(void)
m_hiddenServerRequestMessage.clear(); m_hiddenServerRequestMessage.clear();
m_reclaimFocusOnTokenField = true; m_reclaimFocusOnTokenField = true;
if (!hiddenServerToken.empty()) if (m_serverTokenTextBuf[0])
{ {
NetGameServer_t server; NetGameServer_t server;
const bool result = g_MasterServer.GetServerByToken(server, m_hiddenServerRequestMessage, hiddenServerToken); // Send token connect request. const bool result = g_MasterServer.GetServerByToken(server, m_hiddenServerRequestMessage, m_serverTokenTextBuf); // Send token connect request.
if (result && !server.name.empty()) if (result && !server.name.empty())
{ {

1
r5dev/gameui/IBrowser.h
View File

@ -47,6 +47,7 @@ private:
bool m_reclaimFocusOnTokenField; bool m_reclaimFocusOnTokenField;
bool m_queryNewListNonRecursive; // When set, refreshes the server list once the next frame. bool m_queryNewListNonRecursive; // When set, refreshes the server list once the next frame.
bool m_queryGlobalBanList; bool m_queryGlobalBanList;
char m_serverTokenTextBuf[128];
char m_serverAddressTextBuf[128]; char m_serverAddressTextBuf[128];
char m_serverNetKeyTextBuf[30]; char m_serverNetKeyTextBuf[30];