]> git.rm.cloudns.org Git - xonotic/xonotic.git/commitdiff
don't lock session for screenshots, they don't overlap
authorRudolf Polzer <divVerent@xonotic.org>
Tue, 8 Nov 2011 11:41:46 +0000 (12:41 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Tue, 8 Nov 2011 11:41:46 +0000 (12:41 +0100)
misc/tools/xonotic-map-compiler-autobuild
misc/tools/xonotic-map-screenshot

index 76b4611a9dbe687f9ba552b6b1b211feeba671e4..cede0a22d83cbdf41804b996a86bbd83f5256502 100755 (executable)
@@ -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
index ec7774cd3c069c9b219206e787ecbc8f6578f385..aee32664d44ed3e003409fb44fcb201c3910e0ad 100755 (executable)
@@ -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' \