Merge branch 'master' into multituner

Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e469e7c4f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-01-26 (Thu, 26 Jan 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2012-01-26 19:37:46 +04:00
14 changed files with 189 additions and 143 deletions

View File

@@ -248,6 +248,7 @@ int CScanSetup::exec(CMenuTarget* parent, const std::string &actionKey)
g_Zapit->reinitChannels();
if (reloadhintBox)
reloadhintBox->hide();
CNeutrinoApp::getInstance ()->SDTreloadChannels = false;
return res;
}
else if(actionKey=="satsetup")