From 8fd929512b8af771931d66021ed2e8001e0c58eb Mon Sep 17 00:00:00 2001 From: Uriziel Date: Sat, 29 Sep 2012 09:30:15 +0200 Subject: [PATCH] Updated messages --- syncplay/client.py | 5 +++-- syncplay/players/mpc.py | 8 +++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/syncplay/client.py b/syncplay/client.py index b533b93..12a5447 100644 --- a/syncplay/client.py +++ b/syncplay/client.py @@ -260,6 +260,8 @@ class SyncplayClientManager(object): reactor.run() def stop(self, promptForAction = True): + if(promptForAction): + self.ui.promptFor("Press enter to exit\n") if not self.running: return self.running = False @@ -270,8 +272,7 @@ class SyncplayClientManager(object): if self.player: self.player.drop() reactor.callLater(0.1, reactor.stop) - 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 b22aedc..eda3cf8 100644 --- a/syncplay/players/mpc.py +++ b/syncplay/players/mpc.py @@ -43,9 +43,11 @@ class MPCHCAPIPlayer(object): self.__syncplayClient.initPlayer(self) self.handleUpdatedFilename(self.mpc_api.fileplaying) self.ask_for_status() - except: - pass - + except Exception, err: + self.__syncplayClient.ui.showMessage(err.message) + self.__syncplayClient.stop() + + def display_message(self, message): try: self.mpc_api.send_osd(message, 2, 3000)