From bcef086b0e9581030f2866505f736d367b3e1f88 Mon Sep 17 00:00:00 2001 From: Uriziel Date: Sat, 22 Sep 2012 14:47:05 +0200 Subject: [PATCH] Now exists cleanly on mpc close --- syncplay/client.py | 5 +++-- syncplay/players/mpc.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/syncplay/client.py b/syncplay/client.py index 2bfaa36..0903519 100644 --- a/syncplay/client.py +++ b/syncplay/client.py @@ -252,7 +252,7 @@ class SyncplayClientManager(object): self.running = True reactor.run() - def stop(self): + def stop(self, promptForAction = True): if not self.running: return self.running = False @@ -263,7 +263,8 @@ class SyncplayClientManager(object): if self.player: self.player.drop() reactor.callLater(0.1, reactor.stop) - self.ui.promptFor("Press enter to exit") + if(promptForAction): + self.ui.promptFor("Press enter to exit") def checkIfFileMatchesOthers(self): notMatchingList = self.users.getUsersWithNotMatchingFilenames() diff --git a/syncplay/players/mpc.py b/syncplay/players/mpc.py index a3c1a4d..f131d3f 100644 --- a/syncplay/players/mpc.py +++ b/syncplay/players/mpc.py @@ -154,7 +154,7 @@ class MPCHCAPIPlayer(object): self.askLock.release() def mpc_error(self, err=""): - self.__syncplayClient.stop() + self.__syncplayClient.stop(False) sys.exit() def run_mpc(manager, mpc_path, file_path, args):