From b15bc5ed3e9c278d248c16a4940a018b38e5fd31 Mon Sep 17 00:00:00 2001 From: illuminatedwax Date: Mon, 7 Mar 2011 18:13:47 -0600 Subject: [PATCH] bug fix --- TODO | 1 + pesterchum.js | 2 +- pesterchum.py | 8 ++++++-- smilies/{acceptant.png => acceptant.gif} | Bin 4 files changed, 8 insertions(+), 3 deletions(-) rename smilies/{acceptant.png => acceptant.gif} (100%) diff --git a/TODO b/TODO index 1659637..df583b8 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,5 @@ Bugs: +* Windows doesn't show style sheet sometimes?? Maybe related to themes. Features: * copy quirks between profiles? diff --git a/pesterchum.js b/pesterchum.js index a64e3c7..b2b9f4d 100644 --- a/pesterchum.js +++ b/pesterchum.js @@ -1 +1 @@ -{"hideOfflineChums": true, "tabs": true, "soundon": true, "server": "irc.tymoon.eu", "chums": ["unknownTraveler", "tentacleTherapist", "vaginalEngineer", "mechanicalSpectacle", "carcinoGeneticist", "schlagzeugGator", "gamblingGenocider", "gardenGnostic", "centaursTesticle", "arachnidsGrip", "grimAuxiliatrix", "remoteBloodbath", "nitroZealist", "greenZephyr", "arsenicCatnip", "cuttlefishCuller", "rageInducer", "gallowsCalibrator", "caligulasAquarium", "terminallyCapricious", "illuminatedWax", "aquaMarinist", "elegantDiversion", "moirailBunp", "uroborosUnbound", "androidTechnician", "midnightSparrow", "apocalypseArisen", "anguillaNuntia", "oilslickOrchid", "pretentiousFantasia", "aquaticMarinist", "lyricalKeraunoscopic", "counterRealist", "ectoBiologist", "percipientPedestrian", "asceticClinician", "doctectiveMiracles", "noSense", "ircMonster", "twinArmageddons", "cannabisHero", "jetRocket", "adiosToreador", "turntechGodhead", "magmaExploiter", "hannaSongstress", "endlessVoid", "grayscaleVisionary", "corruptedInsanity", "stupidlyBrilliant", "artsyGyarados", "obliviousCrafter", "sporadicAgent", "subtleChaotician"], "defaultprofile": "ghostDunk", "block": []} \ No newline at end of file +{"hideOfflineChums": true, "tabs": true, "soundon": true, "server": "irc.mindfang.org", "chums": ["unknownTraveler", "tentacleTherapist", "vaginalEngineer", "mechanicalSpectacle", "carcinoGeneticist", "schlagzeugGator", "gamblingGenocider", "gardenGnostic", "centaursTesticle", "arachnidsGrip", "grimAuxiliatrix", "remoteBloodbath", "nitroZealist", "greenZephyr", "arsenicCatnip", "cuttlefishCuller", "rageInducer", "gallowsCalibrator", "caligulasAquarium", "terminallyCapricious", "illuminatedWax", "aquaMarinist", "elegantDiversion", "moirailBunp", "uroborosUnbound", "androidTechnician", "midnightSparrow", "apocalypseArisen", "anguillaNuntia", "oilslickOrchid", "pretentiousFantasia", "aquaticMarinist", "lyricalKeraunoscopic", "counterRealist", "ectoBiologist", "percipientPedestrian", "asceticClinician", "doctectiveMiracles", "noSense", "ircMonster", "twinArmageddons", "cannabisHero", "jetRocket", "adiosToreador", "turntechGodhead", "magmaExploiter", "hannaSongstress", "endlessVoid", "grayscaleVisionary", "corruptedInsanity", "stupidlyBrilliant", "artsyGyarados", "obliviousCrafter", "sporadicAgent", "subtleChaotician", "nareSolee", "apostateCourier", "nocturnalTherapist", "algolagnicBaroness", "herpaDerp", "clockworkUtopia", "digitalSamurai", "astronomicalMaster", "slipshodBrisant", "genialDustbuster", "hyperdriveTyphoon", "magnificentMiser", "gentleRuffian"], "defaultprofile": "ghostDunk", "block": []} \ No newline at end of file diff --git a/pesterchum.py b/pesterchum.py index 92ac50c..cb5ce96 100644 --- a/pesterchum.py +++ b/pesterchum.py @@ -1192,8 +1192,12 @@ class PesterWindow(MovingWindow): self.alarm = NoneSound() self.ceasesound = NoneSound() else: - self.alarm = pygame.mixer.Sound(theme["main/sounds/alertsound"]) - self.ceasesound = pygame.mixer.Sound(theme["main/sounds/ceasesound"]) + try: + self.alarm = pygame.mixer.Sound(theme["main/sounds/alertsound"]) + self.ceasesound = pygame.mixer.Sound(theme["main/sounds/ceasesound"]) + except Exception, e: + self.alarm = NoneSound() + self.ceasesound = NoneSound() def changeTheme(self, theme): self.theme = theme diff --git a/smilies/acceptant.png b/smilies/acceptant.gif similarity index 100% rename from smilies/acceptant.png rename to smilies/acceptant.gif