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 branch 'uncool/dvbsi++'

Browse Source 
Conflicts:
	data/icons/border_lr.png
	data/icons/border_ul.png
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: e5e7d52fa1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-23 (Fri, 23 Nov 2012)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2012-11-23 18:45:22 +01:00
parent 7af33af482 060e88ba9f
commit 4edeb50241
40 changed files with 435 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/system/setting_helpers.cpp
View File

@@ -58,7 +58,7 @@
#include <gui/widget/stringinput.h>
#include <gui/infoclock.h>
#include <driver/volume.h>
#include <system/helpers.h>
// obsolete #include <gui/streaminfo.h>
#include <gui/widget/messagebox.h>
@@ -472,7 +472,7 @@ int CDataResetNotifier::exec(CMenuTarget* /*parent*/, const std::string& actionK
return true;
if(delete_all) {
system("rm -f /var/tuxbox/config/zapit/*.conf");
my_system("/bin/sh", "-c", "rm -f /var/tuxbox/config/zapit/*.conf");
CServiceManager::getInstance()->SatelliteList().clear();
CZapit::getInstance()->LoadSettings();
CZapit::getInstance()->GetConfig(zapitCfg);
@@ -492,7 +492,7 @@ int CDataResetNotifier::exec(CMenuTarget* /*parent*/, const std::string& actionK
CFrameBuffer::getInstance()->Clear();
}
if(delete_chan) {
system("rm -f /var/tuxbox/config/zapit/*.xml");
my_system("/bin/sh", "-c", "rm -f /var/tuxbox/config/zapit/*.xml");
g_Zapit->reinitChannels();
}
return ret;