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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3477104928
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-01 (Sat, 01 Jul 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-07-01 14:40:12 +02:00
parent 1de547cd24 9473eabf2a
commit 109fd421aa
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/opkg_manager.cpp
View File

@@ -674,9 +674,10 @@ string COPKGManager::getPkgDescription(std::string pkgName, std::string pkgDesc)
fseek(fd, 0, SEEK_END); fseek(fd, 0, SEEK_END);
fgetpos(fd, &fz); fgetpos(fd, &fz);
fseek(fd, 0, SEEK_SET); fseek(fd, 0, SEEK_SET);
if (fz.__pos == 0) if (fz.__pos == 0){
fclose(fd);
return pkgDesc; return pkgDesc;
}
char buf[512]; char buf[512];
string package, version, description; string package, version, description;
while (fgets(buf, sizeof(buf), fd)) { while (fgets(buf, sizeof(buf), fd)) {

2
src/gui/timerlist.cpp
View File

@@ -1827,7 +1827,7 @@ int CTimerList::newTimer()
bool CTimerList::askUserOnRemoteTimerConflict(time_t announceTime, time_t stopTime, char * remotebox_name) bool CTimerList::askUserOnRemoteTimerConflict(time_t announceTime, time_t stopTime, char * remotebox_name)
{ {
CTimerd::TimerList overlappingTimers; CTimerd::TimerList overlappingTimers;
int pre,post; int pre = 0,post = 0;
Timer->getRecordingSafety(pre,post); Timer->getRecordingSafety(pre,post);
for (CTimerd::TimerList::iterator it = timerlist.begin(); it != timerlist.end();++it) for (CTimerd::TimerList::iterator it = timerlist.begin(); it != timerlist.end();++it)