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 remote-tracking branch 'tuxbox/master'

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 189a4c62d1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2017-10-01 13:08:15 +02:00
parent 8bf6388531 61a2b10f7e
commit df2178a9c0
40 changed files with 1185 additions and 934 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/hdd_menu.cpp
View File

@@ -1328,7 +1328,7 @@ int CHDDMenuHandler::checkDevice(std::string dev)
progress->showGlobalStatus(100);
progress->showStatusMessageUTF(buf);
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
loop = true;
while (loop)
{