From 59febbe94dbebf73a953f12f096fc03b51b99b81 Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Fri, 10 Jan 2020 22:30:25 +0100 Subject: [PATCH] Revert "cam_menu: reduce dub code, avoid possible format-truncation error" This reverts commit bf9b5270b9387887cac10f464f6b521805d60b08. Signed-off-by: MarkusVolk Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/cb3e66585eda2ee78702c8da43c089951ec50f99 Author: Markus Volk Date: 2020-01-10 (Fri, 10 Jan 2020) ------------------ This commit was generated by Migit --- src/gui/cam_menu.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/gui/cam_menu.cpp b/src/gui/cam_menu.cpp index 36dbfbe92..94d47b883 100644 --- a/src/gui/cam_menu.cpp +++ b/src/gui/cam_menu.cpp @@ -343,19 +343,23 @@ int CCAMMenuHandler::handleCamMsg(const neutrino_msg_t msg, neutrino_msg_data_t #endif if (in_menu) 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"; - if (ca) ca->ModuleName(SlotType, curslot, name); - if(MsgId == CA_MESSAGE_MSG_INIT_OK) { - 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); - CCamManager::getInstance()->Start(CZapit::getInstance()->GetCurrentChannelID(), CCamManager::PLAY, true); - } + snprintf(str, sizeof(str), "%s %d: %s", + g_Locale->getText(SlotType == CA_SLOT_TYPE_CI ? LOCALE_CI_INIT_OK : LOCALE_SC_INIT_OK), (int)curslot+1, name); + 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) + 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); + snprintf(str, sizeof(str), "%s %d: %s", + 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); ShowHint(LOCALE_MESSAGEBOX_INFO, str, 450, 3);