X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=sql-edition%2Fservers%2FVendServer.py;h=447dcf76846403c8d82da72627b7e21e01a4e99d;hb=356b151a7886090c530488f1ced311130923cbbc;hp=9d8e0ae9c453b3b2179e4a831e8b6fa140cbb864;hpb=b44cb3829409e26c72c249d660d62090236a51c9;p=zanchey%2Fdispense2.git

diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index 9d8e0ae..447dcf7 100755
--- a/sql-edition/servers/VendServer.py
+++ b/sql-edition/servers/VendServer.py
@@ -80,16 +80,14 @@ def door_open_mode(vending_machine):
 	print "Entering open door mode"
 	v.display("DOOR  OPEN")
 	while True:
-		v.wait_for_events(1)
-		while True:
-			e = v.next_event()
-			if e == None: break
-			(event, params) = e
-			if event == DOOR:
-				if params == 1: # door closed
-					v.display("BYE BYE!")
-					time.sleep(1)
-					return
+		e = v.next_event()
+		if e == None: break
+		(event, params) = e
+		if event == DOOR:
+			if params == 1: # door closed
+				v.display("BYE BYE!")
+				time.sleep(1)
+				return
 
 if __name__ == '__main__':
 	# Open vending machine via LAT
@@ -136,9 +134,8 @@ if __name__ == '__main__':
 			need_repaint = True
 			continue
 
-		v.wait_for_events(1)
 		while True:
-			e = v.next_event()
+			e = v.next_event(1)
 			if e == None: break
 			(event, params) = e
 			print e
@@ -262,6 +259,4 @@ if __name__ == '__main__':
 						scrolling_wraps = True
 						need_repaint = True
 
-			v.wait_for_events(0)
-
 		db.handle_events()