src/engine/client/serverbrowser_http.cpp

@@ -424,10 +424,7 @@ void CServerBrowserHttp::Refresh()
 }
 bool ServerbrowserParseUrl(NETADDR *pOut, const char *pUrl)
 {
-	int Failure = net_addr_from_url(pOut, pUrl, nullptr, 0);
+	return net_addr_from_url(pOut, pUrl, nullptr, 0) != 0;
-	if(Failure || pOut->port == 0)
-		return true;
-	return false;
 }
 bool CServerBrowserHttp::Validate(json_value *pJson)
 {

src/game/client/ui.cpp

@@ -1301,24 +1301,21 @@ float CUi::DoScrollbarV(const void *pId, const CUIRect *pRect, float Current)
 	}
 	else if(HotItem() == pId)
 	{
-		if(InsideHandle)
+		if(MouseButton(0))
-		{
-			if(MouseButton(0))
-			{
-				SetActiveItem(pId);
-				m_ActiveScrollbarOffset = MouseY() - Handle.y;
-				Grabbed = true;
-			}
-		}
-		else if(MouseButtonClicked(0))
 		{
 			SetActiveItem(pId);
-			m_ActiveScrollbarOffset = Handle.h / 2.0f;
+			m_ActiveScrollbarOffset = MouseY() - Handle.y;
 			Grabbed = true;
 		}
 	}
+	else if(MouseButtonClicked(0) && !InsideHandle && InsideRail)
+	{
+		SetActiveItem(pId);
+		m_ActiveScrollbarOffset = Handle.h / 2.0f;
+		Grabbed = true;
+	}
 
-	if(InsideRail && !MouseButton(0))
+	if(InsideHandle && !MouseButton(0))
 	{
 		SetHotItem(pId);
 	}
@@ -1383,22 +1380,19 @@ float CUi::DoScrollbarH(const void *pId, const CUIRect *pRect, float Current, co
 	}
 	else if(HotItem() == pId)
 	{
-		if(InsideHandle)
+		if(MouseButton(0))
-		{
-			if(MouseButton(0))
-			{
-				SetActiveItem(pId);
-				m_ActiveScrollbarOffset = MouseX() - Handle.x;
-				Grabbed = true;
-			}
-		}
-		else if(MouseButtonClicked(0))
 		{
 			SetActiveItem(pId);
-			m_ActiveScrollbarOffset = Handle.w / 2.0f;
+			m_ActiveScrollbarOffset = MouseX() - Handle.x;
 			Grabbed = true;
 		}
 	}
+	else if(MouseButtonClicked(0) && !InsideHandle && InsideRail)
+	{
+		SetActiveItem(pId);
+		m_ActiveScrollbarOffset = Handle.w / 2.0f;
+		Grabbed = true;
+	}
 
 	if(!pColorInner && (InsideHandle || Grabbed) && (CheckActiveItem(pId) || HotItem() == pId))
 	{
@@ -1406,7 +1400,7 @@ float CUi::DoScrollbarH(const void *pId, const CUIRect *pRect, float Current, co
 		Handle.y -= 1.5f;
 	}
 
-	if(InsideRail && !MouseButton(0))
+	if(InsideHandle && !MouseButton(0))
 	{
 		SetHotItem(pId);
 	}