mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-26 23:13:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/fb-setmode

Browse Source
This commit is contained in:
M. Liebmann
2017-04-24 22:35:45 +02:00
parent d3ceb0ec7b aaa7b41d0b
commit 1852183fa6
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libtuxtxt/Makefile.am
View File

@@ -5,7 +5,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/lib/libconfigfile \ -I$(top_srcdir)/lib/libconfigfile \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/zapit/include \ -I$(top_srcdir)/src/zapit/include \
$(FREETYPE_CFLAGS) \ @FREETYPE_CFLAGS@ \
@SIGC_CFLAGS@ \ @SIGC_CFLAGS@ \
@HWLIB_CFLAGS@ @HWLIB_CFLAGS@

4
src/zapit/src/femanager.cpp
View File

@@ -371,7 +371,9 @@ void CFEManager::saveSettings(bool write)
void CFEManager::copySettings(CFrontend * from, CFrontend * to) void CFEManager::copySettings(CFrontend * from, CFrontend * to)
{ {
INFO("Copy settings fe %d -> fe %d", from->fenumber, to->fenumber); INFO("Copy settings fe %d -> fe %d", from->fenumber, to->fenumber);
if (to->config.diseqcType != DISEQC_UNICABLE || to->config.diseqcType != DISEQC_UNICABLE2 || to->getMode() == CFrontend::FE_MODE_LINK_LOOP) if ((to->config.diseqcType != DISEQC_UNICABLE &&
to->config.diseqcType != DISEQC_UNICABLE2) ||
to->getMode() == CFrontend::FE_MODE_LINK_LOOP)
to->config.diseqcType = from->config.diseqcType; to->config.diseqcType = from->config.diseqcType;
to->config.diseqcRepeats = from->config.diseqcRepeats; to->config.diseqcRepeats = from->config.diseqcRepeats;