diff --git a/fallout.py b/fallout.py index 42966b8..5ff34ef 100755 --- a/fallout.py +++ b/fallout.py @@ -5,7 +5,7 @@ import fallout_locked as locked import fallout_hack as hack import fallout_selection as select import fallout_data as data -from fallout_functions import soundTest, isQueueEmpty, addSound +from fallout_functions import soundTest, queueIsEmpty, addSound from time import sleep import sys @@ -22,10 +22,10 @@ if '--preload' in sys.argv: try: addSound("poweron") - while not isQueueEmpty(): + while not queueIsEmpty(): sleep(0.2) if skip or boot.beginBoot(hard): - while not isQueueEmpty(): + while not queueIsEmpty(): sleep(0.2) pwd = None if not skip: @@ -34,12 +34,12 @@ try: pwd = "VERYVERYSECUREPASSWORD" if pwd != None: login.beginLogin(hard, 'ADMIN', pwd) - while not isQueueEmpty(): + while not queueIsEmpty(): sleep(0.2) sel = 0 while sel != 3: sel = select.beginSelection(data.ROBCO_HEADERS, data.SOFT_HEADERS, data.MAIN_MENU) - while not isQueueEmpty(): + while not queueIsEmpty(): sleep(0.2) if sel == 0: loc = 0 @@ -78,5 +78,5 @@ except KeyboardInterrupt: pass addSound("poweroff") -while not isQueueEmpty(): +while not queueIsEmpty(): sleep(0.2) diff --git a/fallout_functions.py b/fallout_functions.py index 1273ad5..aaa6ef4 100644 --- a/fallout_functions.py +++ b/fallout_functions.py @@ -122,7 +122,7 @@ def _playQueue(): sleep(0.02) -def isQueueEmpty(): +def queueIsEmpty(): """ Check if the sound queue is empty """ @@ -143,7 +143,7 @@ def soundTest(): addSound("poweroff") addSound("poweroff") global _soundQueue - while not isQueueEmpty(): + while not queueIsEmpty(): sleep(0.2)