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

fix another merge error

Browse Source 
Origin commit data
------------------
Commit: 59a9cc5dff
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- fix another merge error
This commit is contained in:
vanhofen
2017-11-03 08:45:06 +01:00
parent fbfecb936d
commit dbc81968f9
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/audio_select.cpp
View File

@@ -184,11 +184,7 @@ int CAudioSelectMenuHandler::doMenu ()
} }
perc_str[i] = to_string(perc_val[i]) + "%"; perc_str[i] = to_string(perc_val[i]) + "%";
<<<<<<< HEAD
CMenuForwarder *fw = new CMenuForwarder(is_mp ? mp->getAPIDDesc(i).c_str() : g_RemoteControl->current_PIDs.APIDs[i].desc,
=======
CMenuForwarder *fw = new CMenuForwarder(is_mp ? mp->getAPIDDesc(i).c_str() : g_RemoteControl->current_PIDs.APIDs[i].desc, CMenuForwarder *fw = new CMenuForwarder(is_mp ? mp->getAPIDDesc(i).c_str() : g_RemoteControl->current_PIDs.APIDs[i].desc,
>>>>>>> ni/tuxbox
true, perc_str[i], this, "s", CRCInput::convertDigitToKey(i + 1)); true, perc_str[i], this, "s", CRCInput::convertDigitToKey(i + 1));
fw->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true); fw->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true);
fw->setMarked(sel_apid == i); fw->setMarked(sel_apid == i);