fix crash
This commit is contained in:
@@ -74,17 +74,17 @@ void PaneDisplay::Load( const RString &sMetricsGroup, PlayerNumber pn )
|
|||||||
if( g_Contents[p].type == NUM_PANES )
|
if( g_Contents[p].type == NUM_PANES )
|
||||||
continue; /* skip, disabled */
|
continue; /* skip, disabled */
|
||||||
|
|
||||||
m_ContentsFrame.AddChild( &m_textContents[p] );
|
|
||||||
m_textContents[p].LoadFromFont( THEME->GetPathF(sMetricsGroup,"text") );
|
m_textContents[p].LoadFromFont( THEME->GetPathF(sMetricsGroup,"text") );
|
||||||
m_textContents[p].SetName( ssprintf("%sText", g_Contents[p].name) );
|
m_textContents[p].SetName( ssprintf("%sText", g_Contents[p].name) );
|
||||||
ActorUtil::LoadAllCommands( m_textContents[p], sMetricsGroup );
|
ActorUtil::LoadAllCommands( m_textContents[p], sMetricsGroup );
|
||||||
ActorUtil::SetXYAndOnCommand( m_textContents[p], sMetricsGroup );
|
ActorUtil::SetXYAndOnCommand( m_textContents[p], sMetricsGroup );
|
||||||
|
m_ContentsFrame.AddChild( &m_textContents[p] );
|
||||||
|
|
||||||
m_ContentsFrame.AddChild( m_Labels[p] );
|
|
||||||
m_Labels[p].Load( THEME->GetPathG(sMetricsGroup,RString(g_Contents[p].name)+" label") );
|
m_Labels[p].Load( THEME->GetPathG(sMetricsGroup,RString(g_Contents[p].name)+" label") );
|
||||||
m_Labels[p]->SetName( ssprintf("%sLabel", g_Contents[p].name) );
|
m_Labels[p]->SetName( ssprintf("%sLabel", g_Contents[p].name) );
|
||||||
ActorUtil::LoadAllCommands( *m_Labels[p], sMetricsGroup );
|
ActorUtil::LoadAllCommands( *m_Labels[p], sMetricsGroup );
|
||||||
ActorUtil::SetXYAndOnCommand( m_Labels[p], sMetricsGroup );
|
ActorUtil::SetXYAndOnCommand( m_Labels[p], sMetricsGroup );
|
||||||
|
m_ContentsFrame.AddChild( m_Labels[p] );
|
||||||
|
|
||||||
ActorUtil::LoadAllCommandsFromName( m_textContents[p], sMetricsGroup, g_Contents[p].name );
|
ActorUtil::LoadAllCommandsFromName( m_textContents[p], sMetricsGroup, g_Contents[p].name );
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user