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

Merge branch 'master' into pu/mp

Browse Source 
Origin commit data
------------------
Commit: 4fc73acffc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-29 (Fri, 29 Sep 2017)
This commit is contained in:
Jacek Jendrzej
2017-09-29 10:49:27 +02:00
parent 2417d86939 20451a9be6
commit 384b18ad8e
27 changed files with 89 additions and 95 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)
{