mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 08:51:04 +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 
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/audioplayer.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3f812037a5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-06-28 22:49:34 +02:00
parent 0ddfa9d204 43d2aeee1c
commit 817425d877
4 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/components/cc_frm_footer.cpp
View File

@@ -123,8 +123,8 @@ void CComponentsFooter::setButtonLabels(const struct button_label_cc * const con
* If already existing some items then subtract those width from footer width.
* ...so we have the possible usable size for button container.
*/
if(!v_cc_items.empty()){ //FIXME: footer container seems always not empty here, so here j initialized with = 1. I dont't know where it comes from! dbt!
for (size_t j= 1; j< size(); j++)
if(!v_cc_items.empty()){
for (size_t j= 0; j< size(); j++)
w_chain -= getCCItem(j)->getWidth();
}