Proper fix for map_spot hind show logic

OGSR · Dec 3, 2018 · e7651ab · e7651ab
1 parent 067eb86
commit e7651ab
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/ogsr_engine/xrGame/map_spot.cpp b/ogsr_engine/xrGame/map_spot.cpp
@@ -26,21 +26,22 @@ void CMapSpot::Load(CUIXml* xml, LPCSTR path)
 	int i = xml->ReadAttribInt(path, 0, "scale", 0);
 	m_bScale			= (i==1);
 
-  SetWidth(GetWidth() * UI()->get_current_kx() );
-  SetStretchTexture(true);
+	SetWidth(GetWidth() * UI()->get_current_kx() );
+	SetStretchTexture(true);
 
 	m_originSize		= GetWndSize();
 }
 
 LPCSTR CMapSpot::GetHint()
 {
-	return MapLocation() ? MapLocation()->GetHint() : nullptr;
+	return MapLocation()->GetHint();
 }
 
 void CMapSpot::Update()
 {
 	inherited::Update();
-	if ( m_bCursorOverWindow && xr_strlen( GetHint() ) ) {
+	LPCSTR h = GetHint();
+	if ( m_bCursorOverWindow && h && xr_strlen( h ) ) {
 		VERIFY(m_dwFocusReceiveTime>=0);
 		if( Device.dwTimeGlobal>(m_dwFocusReceiveTime+500) ){
 			GetMessageTarget()->SendMessage(this, MAP_SHOW_HINT, NULL);
@@ -74,7 +75,8 @@ bool CMapSpot::OnMouseDown		(int mouse_btn)
 void CMapSpot::OnFocusLost		()
 {
 	inherited::OnFocusLost		();
-	if ( xr_strlen( GetHint() ) )
+	LPCSTR h = GetHint();
+	if ( h && xr_strlen( h ) )
 	  GetMessageTarget()->SendMessage( this, MAP_HIDE_HINT, NULL );
 }