mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 23:42:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'check/next-cc'

Browse Source 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: eca8f5459b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-19 (Sun, 19 Jan 2014)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2014-01-19 13:37:24 +01:00
parent 9f67acf417 81ec9a0e26
commit 19cb443dec
15 changed files with 213 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/scan_setup.cpp
View File

@@ -34,6 +34,8 @@
#include <config.h>
#endif
#include <unistd.h>
#include <global.h>
#include <neutrino.h>
#include <mymenu.h>
@@ -261,6 +263,9 @@ int CScanSetup::exec(CMenuTarget* parent, const std::string &actionKey)
if (reloadhintBox)
reloadhintBox->hide();
CNeutrinoApp::getInstance ()->SDTreloadChannels = false;
if(file_exists(CURRENTSERVICES_XML)){
unlink(CURRENTSERVICES_XML);
}
return res;
}
else if(actionKey == "satsetup")