summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStuart Morgan <smorgan@mythtv.org>2011-02-01 14:20:09 (GMT)
committer Stuart Morgan <smorgan@mythtv.org>2011-02-01 14:31:57 (GMT)
commit8bf1a3a492d5b0b9c152fd4a3d97e31adcde28af (patch)
treee810074faed210ec764f3df90ef11095582ae5f6
parent9502a6d467dc9560dd88820bb2ebfdb24d12a560 (diff)
Don't overwrite default help text if the current widget does not provide any of it's own.
(cherry picked from commit 5aa72ebce5661e966b1c5a73a576bc1bf7c3cca1)
-rw-r--r--mythtv/libs/libmythui/mythscreentype.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/mythtv/libs/libmythui/mythscreentype.cpp b/mythtv/libs/libmythui/mythscreentype.cpp
index 6b9f3a4..3cd8fda 100644
--- a/mythtv/libs/libmythui/mythscreentype.cpp
+++ b/mythtv/libs/libmythui/mythscreentype.cpp
@@ -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;
}