From 80901d020621b28dcbde564d1d45f23fcd0ff746 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Tue, 8 Nov 2011 12:41:46 +0100 Subject: [PATCH] don't lock session for screenshots, they don't overlap --- misc/tools/xonotic-map-compiler-autobuild | 2 +- misc/tools/xonotic-map-screenshot | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild index 76b4611a..cede0a22 100755 --- a/misc/tools/xonotic-map-compiler-autobuild +++ b/misc/tools/xonotic-map-compiler-autobuild @@ -230,7 +230,7 @@ screenshotthemap() else #startx "$PWD/misc/tools/xonotic-map-screenshot" "$M" $screenshot_override +"scr_screenshot_name \"$M-\"" -- :8 #startx "$PWD/misc/tools/xonotic-map-screenshot" "$M" $screenshot_override +"scr_screenshot_name \"$M-\"" -gl_driver /usr/local/lib/gallium3d/libGL.so -- /usr/bin/Xvfb :8 -screen 0 1024x768x24 - startx "$PWD/misc/tools/xonotic-map-screenshot" "$M" $screenshot_override +"set scr_screenshot_timestamp 0" +"scr_screenshot_name \"$M-\"" -- /usr/bin/Xvfb :8 -screen 0 1024x768x24 + startx "$PWD/misc/tools/xonotic-map-screenshot" "$M" $screenshot_override +"scr_screenshot_name \"$M-\"" -- /usr/bin/Xvfb :8 -screen 0 1024x768x24 fi ) if ! mv ~/.xonotic/data/screenshots "$M-$blobhash"; then diff --git a/misc/tools/xonotic-map-screenshot b/misc/tools/xonotic-map-screenshot index ec7774cd..aee32664 100755 --- a/misc/tools/xonotic-map-screenshot +++ b/misc/tools/xonotic-map-screenshot @@ -9,6 +9,8 @@ count=`yes x | head -n "$count" | tr -cd x` ./all run \ -nosound \ + +'locksession 0' \ + +'scr_screenshot_timestamp 0' \ +'vid_fullscreen 0' \ +'exec effects-ultimate.cfg' \ +'vid_soft 1' \ -- 2.39.2