Skip to content

Fix issue #197: Ctrl+C interrupt no longer causes Traceback error when slideshow is cleared #212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix issue #197: Ctrl+C interrupt no longer causes Traceback error when slideshow is cleared #212

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions pokemonterminal/slideshow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,20 @@ def __get_listener_thread(event):

def __slideshow_worker(filtered, delay, changer_func, event_name):
with PlatformNamedEvent(event_name) as e:
t = __get_listener_thread(e)
random.shuffle(filtered)
queque = iter(filtered)
while t.is_alive():
next_pkmn = next(queque, None)
if next_pkmn is None:
random.shuffle(filtered)
queque = iter(filtered)
continue
changer_func(next_pkmn.get_path())
t.join(delay * 60)
try:
t = __get_listener_thread(e)
random.shuffle(filtered)
queque = iter(filtered)
while t.is_alive():
next_pkmn = next(queque, None)
if next_pkmn is None:
random.shuffle(filtered)
queque = iter(filtered)
continue
changer_func(next_pkmn.get_path())
t.join(delay * 60)
except KeyboardInterrupt:
pass

def start(filtered, delay, changer_func, event_name):
p = multiprocessing.Process(target=__slideshow_worker, args=(filtered, delay, changer_func, event_name, ), daemon=True)
Expand Down