mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 00:41:09 +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/gui/audioplayer.cpp
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a58f2cc447
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-25 11:36:34 +02:00
parent b28f1676c6 1736a5fca8
commit cd18fa9ca0
37 changed files with 122 additions and 732 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/nhttpd/tuxboxapi/Makefile.am
View File

@@ -16,6 +16,7 @@ AM_CPPFLAGS += \
@SIGC_CFLAGS@ \
@FREETYPE_CFLAGS@ \
@AVFORMAT_CFLAGS@ \
@LUA_CFLAGS@ \
@HWLIB_CFLAGS@
noinst_LIBRARIES = libnhttpd_tuxboxapi.a

2
src/nhttpd/tuxboxapi/neutrinoyparser.cpp
View File

@@ -806,7 +806,7 @@ std::string CNeutrinoYParser::func_unmount_get_list(CyhookHandler *, std::strin
in >> ymount >> ylocal_dir >> yfstype;
in.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
yfstype = trim(yfstype);
if( (yfstype == "nfs") << (yfstype == "ftp") || (yfstype == "lufsd") )
if( (yfstype == "nfs") || (yfstype == "ftp") || (yfstype == "lufsd") )
{
mounts=ylocal_dir +" on "+ ymount + " ("+yfstype+")";
ysel = ((j==0) ? "checked=\"checked\"" : "");