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

Origin commit data
------------------
Branch: ni/coolstream
Commit: 2470f59ece
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-10-14 12:41:52 +02:00

View File

@@ -44,8 +44,15 @@ function do_snapshot() {
filename = id("filename").value;
}
if ("{=var-get:grab=}" != "" && enableVideo == 0)
dbox_exec_tools("fbshot grab -p -o /tmp/"+filename+".png");
if ("{=var-get:grab=}" != "")
{
if (enableOSD == 1 && enableVideo == 1)
dbox_exec_tools("fbshot grab -p /tmp/"+filename+".png");
else if (enableOSD == 1)
dbox_exec_tools("fbshot grab -p -o /tmp/"+filename+".png");
else if (enableVideo == 1)
dbox_exec_tools("fbshot grab -p -v /tmp/"+filename+".png");
}
else if ("{=var-get:fbshot=}" != "" && enableVideo == 0)
dbox_exec_tools("fbshot fbshot /tmp/"+filename+".png");
else