mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 01:11:06 +02:00
CImageInfo: use call of getTextFromFile() without explicit object
Origin commit data
------------------
Branch: ni/coolstream
Commit: cd53fae2c6
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-04-14 (Tue, 14 Apr 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -339,14 +339,13 @@ string CImageInfo::getLicenseText()
|
||||
file += g_settings.language;
|
||||
file += ".license";
|
||||
|
||||
CComponentsText txt;
|
||||
string res = txt.getTextFromFile(file);
|
||||
string res = CComponentsText::getTextFromFile(file);
|
||||
|
||||
//assign default text, if language file is not available
|
||||
if(res.empty()){
|
||||
file = LICENSEDIR;
|
||||
file += "english.license";
|
||||
res = txt.getTextFromFile(file);
|
||||
res = CComponentsText::getTextFromFile(file);
|
||||
}
|
||||
|
||||
return res;
|
||||
|
Reference in New Issue
Block a user