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

fix conflict

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5dd54caf54
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-06-18 (Mon, 18 Jun 2012)


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

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2012-06-18 14:56:17 +04:00
parent 1f992505f7 8f4a18acf5
commit 0e9750eac5
32 changed files with 98 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/epgview.cpp
View File

@@ -567,7 +567,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
// 21.07.2005 - rainerk
// Show extended information
if (0 != epgData.itemDescriptions.size() && 0 != epgData.items.size()) {
if ( !epgData.itemDescriptions.empty() && !epgData.items.empty()) {
char line[256];
std::vector<std::string>::iterator description;
std::vector<std::string>::iterator item;