diff options
| author | Andreas Brugger <brougs78@gmx.net> | 2006-01-10 19:38:22 +0100 |
|---|---|---|
| committer | Thomas Günther <tom@toms-cafe.de> | 2009-06-03 02:39:56 +0200 |
| commit | daad17454a344d50150850fd9b9062b200982140 (patch) | |
| tree | 6974de13052cbc11cae7255c8b0ae37b0a1666f5 /xml | |
| parent | eb6eaf285edd82c212810f066313f93dc4a8a129 (diff) | |
| parent | ba472a2d6dc935c03450e0932a22e66703ca3524 (diff) | |
| download | vdr-plugin-text2skin-daad17454a344d50150850fd9b9062b200982140.tar.gz vdr-plugin-text2skin-daad17454a344d50150850fd9b9062b200982140.tar.bz2 | |
2006-01-10: Version 1.1-cvs_ext-0.6 (vdr-text2skin-1.1-cvs_ext-0.6.diff)
- updated to cvs-version of text2skin
- since vdr-1.3.38 it is possible to exactly identify the replayed
recording, so the replay-tokens work now
- switched the search-order for the fonts to priorise the skin-folder
(this avoids error-messages in the log)
Diffstat (limited to 'xml')
| -rw-r--r-- | xml/object.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xml/object.c b/xml/object.c index 73d8a26..3979384 100644 --- a/xml/object.c +++ b/xml/object.c @@ -148,14 +148,14 @@ const cFont *cxObject::Font(void) const if (UseTTF) { - if ((font = cText2SkinFont::Load(SkinPath() + "/fonts", mFontFace, mFontSize, mFontWidth)) - != NULL) - return font; - if ((font = cText2SkinFont::Load(SkinPath() + "/" + mSkin->Name(), mFontFace, mFontSize, mFontWidth)) != NULL) return font; + if ((font = cText2SkinFont::Load(SkinPath() + "/fonts", mFontFace, mFontSize, mFontWidth)) + != NULL) + return font; + } return cFont::GetFont(fontOsd); |