From 94e8db107056a858bc843e5c77d5f17ef2ad81b0 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Thu, 25 Oct 2012 16:51:07 +0400 Subject: [PATCH] gui/cam_menu.cpp: workaround, dont recalc timeout on EVT_TIMER Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/2b0f2ffc565595760a95a53f0453411651aac901 Author: [CST] Focus Date: 2012-10-25 (Thu, 25 Oct 2012) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/cam_menu.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/cam_menu.cpp b/src/gui/cam_menu.cpp index be4d5668c..34071faec 100644 --- a/src/gui/cam_menu.cpp +++ b/src/gui/cam_menu.cpp @@ -474,7 +474,9 @@ int CCAMMenuHandler::doMenu(int slot, CA_SLOT_TYPE slotType) res = menu_return::RETURN_EXIT_ALL; } } else if (ret == 1) { - timeoutEnd = CRCInput::calcTimeoutEnd(10); + /* workaround: dont cycle here on timers */ + if (msg != NeutrinoMessages::EVT_TIMER) + timeoutEnd = CRCInput::calcTimeoutEnd(10); continue; } else if (ret == 2) { doexit = true;