mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-15 09:23:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-09-26 12:52:04 +02:00
parent 8dad062eff ca09c92542
commit b7ceb705a0
52 changed files with 1130 additions and 892 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

@@ -794,7 +794,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\"" : "");