From 2f91dbff13fc59b0425f186d51b7488e0ac440e9 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 14 Oct 2017 12:41:20 +0200 Subject: [PATCH] yWeb: fix grab-handling Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/488d8a667050b31a0f255d76dafd4cf9b0bf7e5c Author: vanhofen Date: 2017-10-14 (Sat, 14 Oct 2017) Origin message was: ------------------ - yWeb: fix grab-handling ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- data/y-web/Y_Tools_Screenshot.yhtm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/data/y-web/Y_Tools_Screenshot.yhtm b/data/y-web/Y_Tools_Screenshot.yhtm index a28cbe6ca..7d8516db0 100644 --- a/data/y-web/Y_Tools_Screenshot.yhtm +++ b/data/y-web/Y_Tools_Screenshot.yhtm @@ -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