Skip to content

Commit

Permalink
Don't overwrite default help text if the current widget does not prov…
Browse files Browse the repository at this point in the history
…ide any of it's own.

(cherry picked from commit 5aa72eb)
  • Loading branch information
stuartm committed Feb 1, 2011
1 parent 9502a6d commit 8bf1a3a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions mythtv/libs/libmythui/mythscreentype.cpp
Expand Up @@ -121,8 +121,8 @@ bool MythScreenType::SetFocusWidget(MythUIType *widget)
m_CurrentFocusWidget = widget;
m_CurrentFocusWidget->TakeFocus();

if (helpText)
helpText->SetText(m_CurrentFocusWidget->GetHelpText());
if (!widget->GetHelpText().isEmpty())
helpText->SetText(widget->GetHelpText());

return true;
}
Expand Down

0 comments on commit 8bf1a3a

Please sign in to comment.