mirror of
https://github.com/wolfpld/tracy.git
synced 2025-03-20 07:40:02 +08:00
Trim address entry field.
Sometimes a stray whitespace may be inserted in the address field, for example when copying and pasting from somewhere else.
This commit is contained in:
+21
-12
@@ -967,20 +967,29 @@ static void DrawContents()
|
||||
connectClicked |= ImGui::Button( ICON_FA_WIFI " Connect" );
|
||||
if( connectClicked && *addr && !loadThread.joinable() )
|
||||
{
|
||||
connHist->Count( addr );
|
||||
auto aptr = addr;
|
||||
while( *aptr == ' ' || *aptr == '\t' ) aptr++;
|
||||
auto aend = aptr;
|
||||
while( *aend && *aend != ' ' && *aend != '\t' ) aend++;
|
||||
|
||||
const auto addrLen = strlen( addr );
|
||||
auto ptr = addr + addrLen - 1;
|
||||
while( ptr > addr && *ptr != ':' ) ptr--;
|
||||
if( *ptr == ':' )
|
||||
if( aptr != aend )
|
||||
{
|
||||
std::string addrPart = std::string( addr, ptr );
|
||||
uint16_t portPart = (uint16_t)atoi( ptr+1 );
|
||||
view = std::make_unique<tracy::View>( RunOnMainThread, addrPart.c_str(), portPart, s_fixedWidth, s_smallFont, s_bigFont, SetWindowTitleCallback, SetupScaleCallback, AttentionCallback, s_config, s_achievements );
|
||||
}
|
||||
else
|
||||
{
|
||||
view = std::make_unique<tracy::View>( RunOnMainThread, addr, port, s_fixedWidth, s_smallFont, s_bigFont, SetWindowTitleCallback, SetupScaleCallback, AttentionCallback, s_config, s_achievements );
|
||||
std::string address( aptr, aend );
|
||||
connHist->Count( address );
|
||||
|
||||
auto adata = address.data();
|
||||
auto ptr = adata + address.size() - 1;
|
||||
while( ptr > adata && *ptr != ':' ) ptr--;
|
||||
if( *ptr == ':' )
|
||||
{
|
||||
std::string addrPart = std::string( adata, ptr );
|
||||
uint16_t portPart = (uint16_t)atoi( ptr+1 );
|
||||
view = std::make_unique<tracy::View>( RunOnMainThread, addrPart.c_str(), portPart, s_fixedWidth, s_smallFont, s_bigFont, SetWindowTitleCallback, SetupScaleCallback, AttentionCallback, s_config, s_achievements );
|
||||
}
|
||||
else
|
||||
{
|
||||
view = std::make_unique<tracy::View>( RunOnMainThread, address.c_str(), port, s_fixedWidth, s_smallFont, s_bigFont, SetWindowTitleCallback, SetupScaleCallback, AttentionCallback, s_config, s_achievements );
|
||||
}
|
||||
}
|
||||
}
|
||||
if( s_config.memoryLimit )
|
||||
|
||||
Reference in New Issue
Block a user