clipmenu

commit a85f8998b40626ac88dce5c5f32a8e9f538a983b
parent caab3f6a62af041305b2c6a68ff68e67d0fdd2e4
Author: Chris Down <chris@chrisdown.name>
Date:   Tue, 20 Feb 2018 09:29:49 +0000

Revert "Make main work block async"

There is currently a bug where this causes a copy storm at startup. More
worryingly, more and more newlines are appended to the end, so something
is going wrong in copy logic anyway, async or not.

This reverts commit 11304d3a60dfc469759c4662743f792cd5d4ca80.

Diffstat:
M
clipmenud
 | 
5
+----

1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/clipmenud b/clipmenud
@@ -11,7 +11,7 @@ major_version=4
 cache_dir=$CM_DIR/clipmenu.$major_version.$USER/
 cache_file=$cache_dir/line_cache
 lock_file=$cache_dir/lock
-lock_timeout=5
+lock_timeout=2
 has_clipnotify=0
 
 # This comes from the environment, so we rely on word splitting.
@@ -141,7 +141,6 @@ while true; do
         fi
     fi
 
-    {
     if ! flock -x -w "$lock_timeout" "$lock_fd"; then
         printf 'ERROR: %s\n' 'Timed out waiting for lock' >&2
         exit 1
@@ -192,10 +191,8 @@ while true; do
     done
 
     flock -u "$lock_fd"
-    } &
 
     if (( CM_ONESHOT )); then
-        wait
         debug 'Oneshot mode enabled, exiting'
         break
     fi