commit eb0e8f26c4e6a3b4a4780132f2270efa530ad816
author rsc <devnull@localhost> Sun Feb 26 04:05:16 2006 +0000
committer rsc <devnull@localhost> Sun Feb 26 04:05:16 2006 +0000
tree 4f018fc97c7f6b0ac2eac61b0e3a7da3f3863025
parent e269d00c9ea2764885ba69aa08fe7b04f27179ec

locking fixes

src/cmd/faces/main.c

diff --git a/src/cmd/faces/main.c b/src/cmd/faces/main.c
index c1fbecf..2563a24 100644
--- a/src/cmd/faces/main.c
+++ b/src/cmd/faces/main.c
@@ -330,7 +330,6 @@
 
 	if(f == nil)
 		return;
-	lockdisplay(display);
 	if(first != 0){
 		first = 0;
 		eresized(0);
@@ -340,6 +339,7 @@
 	nx = nacross;
 	ny = (nfaces+(nx-1)) / nx;
 
+	lockdisplay(display);
 	for(y=ny; y>=0; y--){
 		/* move them along */
 		r0 = facerect(y*nx+0);
@@ -613,8 +613,11 @@
 			for(i=first; i<last; i++)	/* clear vwhois faces */
 				if(ptinrect(p, facerect(i-first)) 
 				&& strstr(faces[i]->str[Sshow], "/XXXvwhois")){
+					lockdisplay(display);
 					delface(i);
 					flushimage(display, 1);
+					unlockdisplay(display);
+					break;
 				}
 		}
 		break;