mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-16 18:03:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: af5ead9f3f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-26 (Tue, 26 Feb 2013)


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

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2013-02-26 11:17:18 +04:00
parent 7112db8663 ef0196c06d
commit 25cfe121c6
4 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/channellist.cpp
View File

@@ -2158,6 +2158,7 @@ void CChannelList::paint_events(int index)
evt.description = g_Locale->getText(LOCALE_EPGLIST_NOEVENTS);
evt.eventID = 0;
evt.startTime = 0;
evtlist.push_back(evt);
}
@@ -2218,6 +2219,7 @@ void CChannelList::readEvents(const t_channel_id channel_id)
CChannelEvent evt;
evt.description = g_Locale->getText(LOCALE_EPGLIST_NOEVENTS);
evt.eventID = 0;
evt.startTime = 0;
evtlist.push_back(evt);
}
else

1
src/gui/infoviewer_bb.cpp
View File

@@ -106,6 +106,7 @@ void CInfoViewerBB::Init()
for (int i = 0; i < CInfoViewerBB::BUTTON_MAX; i++) {
tmp_bbButtonInfoText[i] = "";
bbButtonInfo[i].x = -1;
}
// get HDD info in a separate thread

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

@@ -263,8 +263,7 @@ void CFEManager::saveSettings(bool write)
sprintf(cfg_key, "fe%d_satellites", fe->fenumber);
configfile.setInt32Vector(cfg_key, satList);
}
//setInt32Vector dont set modified flag !
if (write /*&& configfile.getModifiedFlag()*/) {
if (write && configfile.getModifiedFlag()) {
config_exist = configfile.saveConfig(FECONFIGFILE);
//configfile.setModifiedFlag(false);
}