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

Merge branch 'cst-next' into nmp-cst-next

Browse Source 
- Fix merge conflicts


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)



------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2016-08-19 17:40:48 +02:00
parent 3daad4c6d5 59d3c49084
commit 2c4ccf9555
260 changed files with 8682 additions and 4001 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/hdd_menu.cpp
View File

@@ -1253,6 +1253,11 @@ int CHDDMenuHandler::checkDevice(std::string dev)
int percent = 0, opercent = 0;
char buf[256] = { 0 };
bool loop;
uint64_t timeoutEnd;
neutrino_msg_t msg;
neutrino_msg_data_t data;
std::string devname = "/dev/" + dev;
printf("CHDDMenuHandler::checkDevice: dev %s\n", dev.c_str());
@@ -1322,7 +1327,16 @@ int CHDDMenuHandler::checkDevice(std::string dev)
progress->showGlobalStatus(100);
progress->showStatusMessageUTF(buf);
sleep(2);
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
loop = true;
while (loop)
{
g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd);
if (msg == CRCInput::RC_timeout || msg == CRCInput::RC_ok || msg == CRCInput::RC_home)
loop = false;
}
progress->hide();
delete progress;