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

Merge branch 'master' into pu/msgbox

Browse Source 
Conflicts:
 	src/gui/followscreenings.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e8c700dd2
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-15 (Tue, 15 Nov 2016)

Origin message was:
------------------
Merge branch 'master' into pu/msgbox

Conflicts:
  	src/gui/followscreenings.cpp


------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2016-11-15 19:49:27 +01:00
parent 4d952e9f00 715af20490
commit 4aa0dca60b
8 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/neutrino.cpp
View File

@@ -481,6 +481,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.timer_remotebox_ip.push_back(timer_rb);
}
}
g_settings.timer_followscreenings = configfile.getInt32( "timer_followscreenings", 1 );
g_settings.infobar_sat_display = configfile.getBool("infobar_sat_display" , true );
g_settings.infobar_show_channeldesc = configfile.getBool("infobar_show_channeldesc" , false );
@@ -1084,6 +1085,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
timer_remotebox_itemcount++;
}
configfile.setInt32 ( "timer_remotebox_ip_count", g_settings.timer_remotebox_ip.size());
configfile.setInt32 ("timer_followscreenings", g_settings.timer_followscreenings);
configfile.setBool("infobar_sat_display" , g_settings.infobar_sat_display );
configfile.setBool("infobar_show_channeldesc" , g_settings.infobar_show_channeldesc );