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

Merge branch 'master' into pu/mp

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3fe94beaa4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-04-24 (Mon, 24 Apr 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2017-04-24 22:39:33 +02:00
parent 229b0d7580 ad1573af8c
commit 0256d5c45a
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)/src \
-I$(top_srcdir)/src/zapit/include \
$(FREETYPE_CFLAGS) \
@FREETYPE_CFLAGS@ \
@SIGC_CFLAGS@ \
@HWLIB_CFLAGS@

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

@@ -381,7 +381,9 @@ void CFEManager::saveSettings(bool write)
void CFEManager::copySettings(CFrontend * from, CFrontend * to)
{
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.diseqcRepeats = from->config.diseqcRepeats;