From bf56c88ee40471043b7f4676726886588e1ce9d3 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Tue, 19 Feb 2013 12:07:29 +0100 Subject: [PATCH] - yweb: return to /bin/fbshot for osd-only screenshots the internal screenshot function seems paralyzed sometimes. --- src/nhttpd/web/Y_Tools_Screenshot.yhtm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/nhttpd/web/Y_Tools_Screenshot.yhtm b/src/nhttpd/web/Y_Tools_Screenshot.yhtm index 165f4fb95..2d6c836cc 100644 --- a/src/nhttpd/web/Y_Tools_Screenshot.yhtm +++ b/src/nhttpd/web/Y_Tools_Screenshot.yhtm @@ -1,3 +1,5 @@ +{=var-set:fbshot={=if-file-exists:/bin/fbshot~true~{=if-file-exists:/var/bin/fbshot~true~false=}=}=} + {=include-block:Y_Blocks.txt;head=} @@ -41,8 +43,12 @@ function do_snapshot() { filename = id("filename").value; } - var _null = loadSyncURL("/control/screenshot?name="+filename+"&osd="+enableOSD+"&video="+enableVideo); - window.setTimeout("do_showshot('"+filename+"');", (enableVideo == 1) ? 3500 : 1500); + if ({=var-get:fbshot=} == true && enableVideo == 0) + dbox_exec_tools("fbshot fb /tmp/"+filename+".png"); + else + loadSyncURL("/control/screenshot?name="+filename+"&osd="+enableOSD+"&video="+enableVideo); + + window.setTimeout("do_showshot('"+filename+"');", (enableVideo == 1) ? 6500 : 3000); } function do_showshot(_filename) { if (_filename == "") @@ -102,7 +108,7 @@ function do_zoomshot(){ {=include-block:Y_Blocks.txt;remote=} - +