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

Revert "cam_menu: reduce dub code, avoid possible format-truncation error"

Browse Source 
This reverts commit bf9b5270b9.

Signed-off-by: MarkusVolk <f_l_k@t-online.de>
This commit is contained in:
MarkusVolk
2020-01-10 18:55:20 +01:00
committed by Thilo Graf
parent f304acb4e5
commit 37f83616a6
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui/cam_menu.cpp
View File

@@ -342,19 +342,23 @@ int CCAMMenuHandler::handleCamMsg(const neutrino_msg_t msg, neutrino_msg_data_t
#endif #endif
if (in_menu) if (in_menu)
msgret = messages_return::cancel_all; msgret = messages_return::cancel_all;
} else if ((MsgId == CA_MESSAGE_MSG_INIT_OK) || (MsgId == CA_MESSAGE_MSG_INIT_FAILED)) { } else if(MsgId == CA_MESSAGE_MSG_INIT_OK) {
char name[255] = "Unknown"; char name[255] = "Unknown";
if (ca) if (ca)
ca->ModuleName(SlotType, curslot, name); ca->ModuleName(SlotType, curslot, name);
if(MsgId == CA_MESSAGE_MSG_INIT_OK) { snprintf(str, sizeof(str), "%s %d: %s",
snprintf(str, sizeof(str) + sizeof(name), "%s %d: %s", g_Locale->getText(SlotType == CA_SLOT_TYPE_CI ? LOCALE_CI_INIT_OK : LOCALE_SC_INIT_OK), (int)curslot+1, name); g_Locale->getText(SlotType == CA_SLOT_TYPE_CI ? LOCALE_CI_INIT_OK : LOCALE_SC_INIT_OK), (int)curslot+1, name);
CCamManager::getInstance()->Start(CZapit::getInstance()->GetCurrentChannelID(), CCamManager::PLAY, true); printf("CCAMMenuHandler::handleCamMsg: %s\n", str);
} CCamManager::getInstance()->Start(CZapit::getInstance()->GetCurrentChannelID(), CCamManager::PLAY, true);
ShowHint(LOCALE_MESSAGEBOX_INFO, str, 450, 3);
} else if(MsgId == CA_MESSAGE_MSG_INIT_FAILED) {
char name[255] = "Unknown";
if (ca)
ca->ModuleName(SlotType, curslot, name);
if(MsgId == CA_MESSAGE_MSG_INIT_FAILED) snprintf(str, sizeof(str), "%s %d: %s",
snprintf(str, sizeof(str) + sizeof(name), "%s %d: %s", g_Locale->getText(SlotType == CA_SLOT_TYPE_CI ? LOCALE_CI_INIT_FAILED : LOCALE_SC_INIT_FAILED), (int)curslot+1, name); g_Locale->getText(SlotType == CA_SLOT_TYPE_CI ? LOCALE_CI_INIT_FAILED : LOCALE_SC_INIT_FAILED), (int)curslot+1, name);
printf("CCAMMenuHandler::handleCamMsg: %s\n", str); printf("CCAMMenuHandler::handleCamMsg: %s\n", str);
ShowHint(LOCALE_MESSAGEBOX_INFO, str, 450, 3); ShowHint(LOCALE_MESSAGEBOX_INFO, str, 450, 3);