Merge remote-tracking branch 'origin/master' into omaster
This commit is contained in:
		
						commit
						3d3c37bc70
					
				
							
								
								
									
										7
									
								
								st.c
									
									
									
									
									
								
							
							
						
						
									
										7
									
								
								st.c
									
									
									
									
									
								
							| @ -3686,6 +3686,8 @@ run(void) { | |||||||
| 	gettimeofday(&last, NULL); | 	gettimeofday(&last, NULL); | ||||||
| 
 | 
 | ||||||
| 	for(xev = actionfps;;) { | 	for(xev = actionfps;;) { | ||||||
|  | 		long deltatime; | ||||||
|  | 
 | ||||||
| 		FD_ZERO(&rfd); | 		FD_ZERO(&rfd); | ||||||
| 		FD_SET(cmdfd, &rfd); | 		FD_SET(cmdfd, &rfd); | ||||||
| 		FD_SET(xfd, &rfd); | 		FD_SET(xfd, &rfd); | ||||||
| @ -3719,8 +3721,9 @@ run(void) { | |||||||
| 			gettimeofday(&lastblink, NULL); | 			gettimeofday(&lastblink, NULL); | ||||||
| 			dodraw = 1; | 			dodraw = 1; | ||||||
| 		} | 		} | ||||||
| 		if(TIMEDIFF(now, last) \ | 		deltatime = TIMEDIFF(now, last); | ||||||
| 				> (xev? (1000/xfps) : (1000/actionfps))) { | 		if(deltatime > (xev? (1000/xfps) : (1000/actionfps)) | ||||||
|  | 				|| deltatime < 0) { | ||||||
| 			dodraw = 1; | 			dodraw = 1; | ||||||
| 			last = now; | 			last = now; | ||||||
| 		} | 		} | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Roberto E. Vargas Caballero
						Roberto E. Vargas Caballero