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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/driver/rcinput.cpp
	src/driver/rcinput.h
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 134e499be0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-22 08:33:33 +01:00
parent 3b3c8d975b 855bce0297
commit b37e4d77de
9 changed files with 281 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/scan.cpp
View File

@@ -287,7 +287,6 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
success = false;
if(!manual) {
g_RCInput->close_click();
if (my_system(NEUTRINO_SCAN_START_SCRIPT) != 0)
perror(NEUTRINO_SCAN_START_SCRIPT " failed");
}
@@ -356,7 +355,6 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
if(!manual) {
if (my_system(NEUTRINO_SCAN_STOP_SCRIPT) != 0)
perror(NEUTRINO_SCAN_STOP_SCRIPT " failed");
g_RCInput->open_click();
}
if(!test) {
CComponentsHeaderLocalized header(x, y, width, hheight, success ? LOCALE_SCANTS_FINISHED : LOCALE_SCANTS_FAILED);