From f50c617d6db0cd6d3d05ad71daed6ea93f260fbc Mon Sep 17 00:00:00 2001
From: Stephen Dranger <dranger@gmail.com>
Date: Fri, 18 Feb 2011 02:17:13 -0600
Subject: [PATCH] bugfixes

---
 convo.pyc             | Bin 25659 -> 25659 bytes
 irc.py                |   7 ++++++-
 irc.pyc               | Bin 14119 -> 14363 bytes
 logs/chums.js         |   2 +-
 menus.py              |  14 ++++++++++---
 menus.pyc             | Bin 25571 -> 25786 bytes
 oyoyo/client.py       |  15 +++++++++-----
 oyoyo/client.pyc      | Bin 10189 -> 10256 bytes
 oyoyo/helpers.pyc     | Bin 5020 -> 5020 bytes
 parsetools.pyc        | Bin 11107 -> 11107 bytes
 pesterchum-update.nsi |   2 +-
 pesterchum.nsi        |   2 +-
 pesterchum.py         |  45 ++++++++++++++++++++++++++++++++++++++++--
 13 files changed, 73 insertions(+), 14 deletions(-)

diff --git a/convo.pyc b/convo.pyc
index 0969b12835ca2bd9e239bb521e4f3365be815629..c5603c49dda375b5b3afbed6af96986a7f63b14d 100644
GIT binary patch
delta 18
acmdmef^qi=M)r%Jc)5x>;x@9IqyPX++6NN=

delta 18
acmdmef^qi=M)r%Jc)2tuMQ>y`NdW*(0S8b3

diff --git a/irc.py b/irc.py
index dc6ae08..9b04ee7 100644
--- a/irc.py
+++ b/irc.py
@@ -24,10 +24,14 @@ class PesterIRC(QtCore.QObject):
         self.cli.command_handler.mainwindow = self.mainwindow
         self.conn = self.cli.connect()
         self.brokenConnection = False
+        self.connectedIRC = False
     def closeConnection(self):
         self.cli.close()
     def setConnectionBroken(self, broken=True):
         self.brokenConnection = True
+    def setConnected(self):
+        self.connectedIRC = True
+        self.connected.emit()
     @QtCore.pyqtSlot(PesterProfile)
     def getMood(self, *chums):
         self.cli.command_handler.getMood(*chums)
@@ -178,6 +182,7 @@ class PesterIRC(QtCore.QObject):
 
 class PesterHandler(DefaultCommandHandler):
     def privmsg(self, nick, chan, msg):
+        msg = msg.decode("utf-8")
         # display msg, do other stuff
         if len(msg) == 0:
             return
@@ -223,7 +228,7 @@ class PesterHandler(DefaultCommandHandler):
 
 
     def welcome(self, server, nick, msg):
-        self.parent.connected.emit()
+        self.parent.setConnected()
         helpers.join(self.client, "#pesterchum")
         mychumhandle = self.mainwindow.profile().handle
         mymood = self.mainwindow.profile().mood.value()
diff --git a/irc.pyc b/irc.pyc
index ffaa5f0e82a5b6aad8f38a37d9efd8753ad32671..b8c874631144c89c1ae601466d7b50ae294999f1 100644
GIT binary patch
delta 4121
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

delta 3803
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

diff --git a/logs/chums.js b/logs/chums.js
index 35ebb39..8e42d74 100644
--- a/logs/chums.js
+++ b/logs/chums.js
@@ -1 +1 @@
-{"macruralAlchemist": {"color": "#700000", "handle": "macruralAlchemist", "mood": "offline"}, "lyricalKeraunoscopic": {"color": "#00aa00", "handle": "lyricalKeraunoscopic", "mood": "offline"}, "fireSwallow": {"color": "#80bb9a", "handle": "fireSwallow", "mood": "offline"}, "aquaMarinist": {"color": "#00caca", "handle": "aquaMarinist", "mood": "offline"}, "centaursTesticle": {"color": "#000056", "handle": "centaursTesticle", "mood": "offline"}, "mechanicalSpectacle": {"color": "#0000ff", "handle": "mechanicalSpectacle", "mood": "offline"}, "depthPerception": {"color": "#6f3886", "handle": "depthPerception", "mood": "offline"}, "carcinoGeneticist": {"color": "#999999", "handle": "carcinoGeneticist", "mood": "offline"}, "greyscalePacifist": {"color": "#7f7f7f", "handle": "greyscalePacifist", "mood": "offline"}, "aquaticMarinist": {"color": "#00caca", "handle": "aquaticMarinist", "mood": "offline"}, "iw": {"color": "#000000", "handle": "iw", "mood": "offline"}, "insipidTranscient": {"color": "#145064", "handle": "insipidTranscient", "mood": "offline"}, "caffeinatedAnalyst": {"color": "#aa0000", "handle": "caffeinatedAnalyst", "mood": "offline"}, "pesterClient394": {"color": "#ff3737", "handle": "pesterClient394", "mood": "offline"}, "absoluteTranquility": {"color": "#000033", "handle": "absoluteTranquility", "mood": "offline"}, "nitroZealist": {"color": "#ff3737", "handle": "nitroZealist", "mood": "offline"}, "cannabisHero": {"color": "#330066", "handle": "cannabisHero", "mood": "offline"}, "quintessentialArbalest": {"color": "#999999", "handle": "quintessentialArbalest", "mood": "offline"}, "noSense": {"color": "#1d0059", "handle": "noSense", "mood": "offline"}, "agogPorphyry": {"color": "#522d80", "handle": "agogPorphyry", "mood": "offline"}, "grimAuxiliatrix": {"color": "#008141", "handle": "grimAuxiliatrix", "mood": "offline"}, "terminallyCapricious": {"color": "#2b0057", "handle": "terminallyCapricious", "mood": "offline"}, "androidTechnician": {"color": "#0000ff", "handle": "androidTechnician", "mood": "offline"}, "ardentAbettor": {"color": "#c8b670", "handle": "ardentAbettor", "mood": "offline"}, "abyssImpulse": {"color": "#68228b", "handle": "abyssImpulse", "mood": "offline"}, "aceIsm": {"color": "#ffcc66", "handle": "aceIsm", "mood": "offline"}, "recalcitrantDisaster": {"color": "#8b0068", "handle": "recalcitrantDisaster", "mood": "offline"}, "apocalypseArisen": {"color": "#a10000", "handle": "apocalypseArisen", "mood": "offline"}, "radicalApologist": {"color": "#ffaa00", "handle": "radicalApologist", "mood": "offline"}, "microMachines": {"color": "#aa00ff", "handle": "microMachines", "mood": "offline"}, "marineAquist": {"color": "#00caca", "handle": "marineAquist", "mood": "offline"}, "uroborosUnbound": {"color": "#00416a", "handle": "uroborosUnbound", "mood": "offline"}, "arachnidsGrip": {"color": "#005682", "handle": "arachnidsGrip", "mood": "offline"}, "caligulasAquarium": {"color": "#6a006a", "handle": "caligulasAquarium", "mood": "offline"}, "percipientPedestrian": {"color": "#00ffff", "handle": "percipientPedestrian", "mood": "offline"}, "tentacleTherapist": {"color": "#cc66ff", "handle": "tentacleTherapist", "mood": "offline"}, "sucroseSaboteur": {"color": "#00e700", "handle": "sucroseSaboteur", "mood": "offline"}, "illuminatedWax": {"color": "#000000", "handle": "illuminatedWax", "mood": "offline"}, "moirailBunp": {"color": "#6a3d0f", "handle": "moirailBunp", "mood": "offline"}, "madLurker": {"color": "#000000", "handle": "madLurker", "mood": "offline"}, "testOut": {"color": "#c760cc", "handle": "testOut", "mood": "offline"}, "pesterClient3022": {"color": "#336600", "handle": "pesterClient3022", "mood": "offline"}, "hellerificJefferson": {"color": "#3300ff", "handle": "hellerificJefferson", "mood": "offline"}, "DocScratch": {"color": "#ffffff", "handle": "DocScratch", "mood": "offline"}, "fallenGaurdian": {"color": "#b03060", "handle": "fallenGaurdian", "mood": "offline"}, "superGhost": {"color": "#800564", "handle": "superGhost", "mood": "offline"}, "arsenicCatnip": {"color": "#006400", "handle": "arsenicCatnip", "mood": "offline"}, "kaleidoscopicMind": {"color": "#ff6666", "handle": "kaleidoscopicMind", "mood": "offline"}, "zealousScarecrow": {"color": "#00c882", "handle": "zealousScarecrow", "mood": "offline"}, "captainCaveman": {"color": "#7c414e", "handle": "captainCaveman", "mood": "offline"}, "gamblingGenocider": {"color": "#00ff00", "handle": "gamblingGenocider", "mood": "offline"}, "cuttlefishCuller": {"color": "#77003c", "handle": "cuttlefishCuller", "mood": "offline"}, "wovenWay": {"color": "#000000", "handle": "wovenWay", "mood": "offline"}, "masterG": {"color": "#77003c", "handle": "masterG", "mood": "offline"}, "elegantDiversion": {"color": "#14b40a", "handle": "elegantDiversion", "mood": "offline"}, "plasmaModerator": {"color": "#5685cc", "handle": "plasmaModerator", "mood": "offline"}, "carcinoGenetecist": {"color": "#7f7f7f", "handle": "carcinoGenetecist", "mood": "offline"}, "ahhIsee": {"color": "#ff5500", "handle": "ahhIsee", "mood": "offline"}, "fadingStar": {"color": "#9932cc", "handle": "fadingStar", "mood": "offline"}, "remoteBloodbath": {"color": "#c70000", "handle": "remoteBloodbath", "mood": "offline"}, "oilslickOrchid": {"color": "#743f7e", "handle": "oilslickOrchid", "mood": "offline"}, "acapellaWaterfall": {"color": "#000099", "handle": "acapellaWaterfall", "mood": "offline"}, "gallowsCalibrator": {"color": "#008282", "handle": "gallowsCalibrator", "mood": "offline"}, "rageInducer": {"color": "#00ffff", "handle": "rageInducer", "mood": "offline"}, "anguillaNuntia": {"color": "#ff007f", "handle": "anguillaNuntia", "mood": "offline"}, "doctectiveMiracles": {"color": "#999900", "handle": "doctectiveMiracles", "mood": "offline"}, "obliviousCrafter": {"color": "#eb5d9d", "handle": "obliviousCrafter", "mood": "offline"}, "greenZephyr": {"color": "#00ca40", "handle": "greenZephyr", "mood": "offline"}, "lawdEngrish": {"color": "#00ff00", "handle": "lawdEngrish", "mood": "offline"}, "pretentiousFantasia": {"color": "#ff66cf", "handle": "pretentiousFantasia", "mood": "offline"}, "counterRealist": {"color": "#10d985", "handle": "counterRealist", "mood": "offline"}, "maxiumumFatness": {"color": "#3366ff", "handle": "maxiumumFatness", "mood": "offline"}, "schlagzeugGator": {"color": "#61821f", "handle": "schlagzeugGator", "mood": "offline"}, "metaliAggressive": {"color": "#9289d5", "handle": "metaliAggressive", "mood": "offline"}, "midnightSparrow": {"color": "#ff55ff", "handle": "midnightSparrow", "mood": "offline"}, "serpentineHerbalist": {"color": "#0000c8", "handle": "serpentineHerbalist", "mood": "offline"}, "magmaExploiter": {"color": "#d90000", "handle": "magmaExploiter", "mood": "offline"}, "gardenGnostic": {"color": "#00ff00", "handle": "gardenGnostic", "mood": "offline"}, "unknownTraveler": {"color": "#006666", "handle": "unknownTraveler", "mood": "offline"}, "utilitarianTurnabout": {"color": "#dd0000", "handle": "utilitarianTurnabout", "mood": "offline"}, "adiosToreador": {"color": "#aa5500", "handle": "adiosToreador", "mood": "offline"}}
\ No newline at end of file
+{"macruralAlchemist": {"color": "#700000", "handle": "macruralAlchemist", "mood": "offline"}, "lyricalKeraunoscopic": {"color": "#00aa00", "handle": "lyricalKeraunoscopic", "mood": "offline"}, "fireSwallow": {"color": "#80bb9a", "handle": "fireSwallow", "mood": "offline"}, "aquaMarinist": {"color": "#00caca", "handle": "aquaMarinist", "mood": "offline"}, "centaursTesticle": {"color": "#000056", "handle": "centaursTesticle", "mood": "offline"}, "mechanicalSpectacle": {"color": "#0000ff", "handle": "mechanicalSpectacle", "mood": "offline"}, "depthPerception": {"color": "#6f3886", "handle": "depthPerception", "mood": "offline"}, "carcinoGeneticist": {"color": "#999999", "handle": "carcinoGeneticist", "mood": "offline"}, "wovenWay": {"color": "#000000", "handle": "wovenWay", "mood": "offline"}, "greyscalePacifist": {"color": "#7f7f7f", "handle": "greyscalePacifist", "mood": "offline"}, "aquaticMarinist": {"color": "#00caca", "handle": "aquaticMarinist", "mood": "offline"}, "iw": {"color": "#000000", "handle": "iw", "mood": "offline"}, "insipidTranscient": {"color": "#145064", "handle": "insipidTranscient", "mood": "offline"}, "caffeinatedAnalyst": {"color": "#aa0000", "handle": "caffeinatedAnalyst", "mood": "offline"}, "pesterClient394": {"color": "#ff3737", "handle": "pesterClient394", "mood": "offline"}, "absoluteTranquility": {"color": "#000033", "handle": "absoluteTranquility", "mood": "offline"}, "nitroZealist": {"color": "#ff3737", "handle": "nitroZealist", "mood": "offline"}, "cannabisHero": {"color": "#330066", "handle": "cannabisHero", "mood": "offline"}, "quintessentialArbalest": {"color": "#999999", "handle": "quintessentialArbalest", "mood": "offline"}, "noSense": {"color": "#1d0059", "handle": "noSense", "mood": "offline"}, "agogPorphyry": {"color": "#522d80", "handle": "agogPorphyry", "mood": "offline"}, "grimAuxiliatrix": {"color": "#008141", "handle": "grimAuxiliatrix", "mood": "offline"}, "terminallyCapricious": {"color": "#2b0057", "handle": "terminallyCapricious", "mood": "offline"}, "androidTechnician": {"color": "#0000ff", "handle": "androidTechnician", "mood": "offline"}, "ardentAbettor": {"color": "#c8b670", "handle": "ardentAbettor", "mood": "offline"}, "abyssImpulse": {"color": "#68228b", "handle": "abyssImpulse", "mood": "offline"}, "aceIsm": {"color": "#ffcc66", "handle": "aceIsm", "mood": "offline"}, "recalcitrantDisaster": {"color": "#8b0068", "handle": "recalcitrantDisaster", "mood": "offline"}, "apocalypseArisen": {"color": "#a10000", "handle": "apocalypseArisen", "mood": "offline"}, "radicalApologist": {"color": "#ffaa00", "handle": "radicalApologist", "mood": "offline"}, "microMachines": {"color": "#aa00ff", "handle": "microMachines", "mood": "offline"}, "marineAquist": {"color": "#00caca", "handle": "marineAquist", "mood": "offline"}, "uroborosUnbound": {"color": "#00416a", "handle": "uroborosUnbound", "mood": "offline"}, "arachnidsGrip": {"color": "#005682", "handle": "arachnidsGrip", "mood": "offline"}, "caligulasAquarium": {"color": "#6a006a", "handle": "caligulasAquarium", "mood": "offline"}, "percipientPedestrian": {"color": "#00ffff", "handle": "percipientPedestrian", "mood": "offline"}, "tentacleTherapist": {"color": "#cc66ff", "handle": "tentacleTherapist", "mood": "offline"}, "sucroseSaboteur": {"color": "#00e700", "handle": "sucroseSaboteur", "mood": "offline"}, "illuminatedWax": {"color": "#000000", "handle": "illuminatedWax", "mood": "offline"}, "moirailBunp": {"color": "#6a3d0f", "handle": "moirailBunp", "mood": "offline"}, "madLurker": {"color": "#000000", "handle": "madLurker", "mood": "offline"}, "testOut": {"color": "#c760cc", "handle": "testOut", "mood": "offline"}, "pesterClient3022": {"color": "#336600", "handle": "pesterClient3022", "mood": "offline"}, "hellerificJefferson": {"color": "#3300ff", "handle": "hellerificJefferson", "mood": "offline"}, "DocScratch": {"color": "#ffffff", "handle": "DocScratch", "mood": "offline"}, "fallenGaurdian": {"color": "#b03060", "handle": "fallenGaurdian", "mood": "offline"}, "superGhost": {"color": "#800564", "handle": "superGhost", "mood": "offline"}, "arsenicCatnip": {"color": "#006400", "handle": "arsenicCatnip", "mood": "offline"}, "kaleidoscopicMind": {"color": "#ff6666", "handle": "kaleidoscopicMind", "mood": "offline"}, "zealousScarecrow": {"color": "#00c882", "handle": "zealousScarecrow", "mood": "offline"}, "captainCaveman": {"color": "#7c414e", "handle": "captainCaveman", "mood": "offline"}, "gamblingGenocider": {"color": "#00ff00", "handle": "gamblingGenocider", "mood": "offline"}, "cuttlefishCuller": {"color": "#77003c", "handle": "cuttlefishCuller", "mood": "offline"}, "sadHomewrecker": {"color": "#55ff00", "handle": "sadHomewrecker", "mood": "offline"}, "masterG": {"color": "#77003c", "handle": "masterG", "mood": "offline"}, "elegantDiversion": {"color": "#14b40a", "handle": "elegantDiversion", "mood": "offline"}, "plasmaModerator": {"color": "#5685cc", "handle": "plasmaModerator", "mood": "offline"}, "carcinoGenetecist": {"color": "#7f7f7f", "handle": "carcinoGenetecist", "mood": "offline"}, "ahhIsee": {"color": "#ff5500", "handle": "ahhIsee", "mood": "offline"}, "fadingStar": {"color": "#9932cc", "handle": "fadingStar", "mood": "offline"}, "remoteBloodbath": {"color": "#c70000", "handle": "remoteBloodbath", "mood": "offline"}, "oilslickOrchid": {"color": "#743f7e", "handle": "oilslickOrchid", "mood": "offline"}, "acapellaWaterfall": {"color": "#000099", "handle": "acapellaWaterfall", "mood": "offline"}, "gallowsCalibrator": {"color": "#008282", "handle": "gallowsCalibrator", "mood": "offline"}, "rageInducer": {"color": "#00ffff", "handle": "rageInducer", "mood": "offline"}, "anguillaNuntia": {"color": "#ff007f", "handle": "anguillaNuntia", "mood": "offline"}, "doctectiveMiracles": {"color": "#999900", "handle": "doctectiveMiracles", "mood": "offline"}, "cannabisHandle": {"color": "#330066", "handle": "cannabisHandle", "mood": "offline"}, "greenZephyr": {"color": "#00ca40", "handle": "greenZephyr", "mood": "offline"}, "lawdEngrish": {"color": "#00ff00", "handle": "lawdEngrish", "mood": "offline"}, "pretentiousFantasia": {"color": "#ff66cf", "handle": "pretentiousFantasia", "mood": "offline"}, "obliviousCrafter": {"color": "#ac0465", "handle": "obliviousCrafter", "mood": "offline"}, "counterRealist": {"color": "#10d985", "handle": "counterRealist", "mood": "offline"}, "maxiumumFatness": {"color": "#3366ff", "handle": "maxiumumFatness", "mood": "offline"}, "schlagzeugGator": {"color": "#61821f", "handle": "schlagzeugGator", "mood": "offline"}, "metaliAggressive": {"color": "#9289d5", "handle": "metaliAggressive", "mood": "offline"}, "midnightSparrow": {"color": "#ff55ff", "handle": "midnightSparrow", "mood": "offline"}, "serpentineHerbalist": {"color": "#0000c8", "handle": "serpentineHerbalist", "mood": "offline"}, "magmaExploiter": {"color": "#d90000", "handle": "magmaExploiter", "mood": "offline"}, "pesterClient865": {"color": "#330066", "handle": "pesterClient865", "mood": "offline"}, "gardenGnostic": {"color": "#00ff00", "handle": "gardenGnostic", "mood": "offline"}, "unknownTraveler": {"color": "#006666", "handle": "unknownTraveler", "mood": "offline"}, "utilitarianTurnabout": {"color": "#dd0000", "handle": "utilitarianTurnabout", "mood": "offline"}, "adiosToreador": {"color": "#aa5500", "handle": "adiosToreador", "mood": "offline"}}
\ No newline at end of file
diff --git a/menus.py b/menus.py
index c6be3a1..4416200 100644
--- a/menus.py
+++ b/menus.py
@@ -636,16 +636,24 @@ class LoadingScreen(QtGui.QDialog):
         self.mainwindow = parent
         self.setStyleSheet(self.mainwindow.theme["main/defaultwindow/style"])
 
-        self.loadinglabel = QtGui.QLabel("LO4D1NG")
-        self.cancel = QtGui.QPushButton("QU1T >:?")
+        self.loadinglabel = QtGui.QLabel("CONN3CT1NG", self)
+        self.cancel = QtGui.QPushButton("QU1T >:?", self)
+        self.ok = QtGui.QPushButton("R3CONN3CT >:]", self)
         self.connect(self.cancel, QtCore.SIGNAL('clicked()'),
                      self, QtCore.SLOT('reject()'))
+        self.connect(self.ok, QtCore.SIGNAL('clicked()'),
+                     self, QtCore.SIGNAL('tryAgain()'))
 
         self.layout = QtGui.QVBoxLayout()
         self.layout.addWidget(self.loadinglabel)
-        self.layout.addWidget(self.cancel)
+        layout_1 = QtGui.QHBoxLayout()
+        layout_1.addWidget(self.cancel)
+        layout_1.addWidget(self.ok)
+        self.layout.addLayout(layout_1)
         self.setLayout(self.layout)
 
+    tryAgain = QtCore.pyqtSignal()
+
 class AboutPesterchum(QtGui.QMessageBox):
     def __init__(self, parent=None):
         QtGui.QMessageBox.__init__(self, parent)
diff --git a/menus.pyc b/menus.pyc
index fc0d6903a778291379d48e0be50b3c73eed28714..91ec0d4d38f61e20b781273dd1a7173b63c332e0 100644
GIT binary patch
delta 613
zcmZuuJx?1!5Pft02K$UT3<fL05)_vr7S^Q!1jrbPG+c~7D3IVV*s)HEkeqXagyq61
z)4+E83kn)q3Iq}bJr%T6`30G|V38u)n|JeO-t5lKzTDFF9Yr30Cq~BS_Aeu^dn-8r
zEnt_><PZ2s*bSf+gd4(u<6%^)rpBTpfdE^Wt;FV)NzL!q)b_N|58@OUXo5}xUBHc_
z8Tu!vi|;0VWI+J#7@A=WNFqX0Xhwt%f}nS){y!;KMu$>4Y8-v;RE{?M{SCMizB4K+
z5=mO_(&PTLVJ_k4-nsslvzE&zMJTn>$<*7X!g)YdGsc&<yCKGJ-y3bu%RtRI*-s-f
zm#?;Mm1+fh(~C0Qt`};#)ulBr!K7lnWjV5^ww!FrlalU_lVZE!9-AM{jOx@4)pJ~0
zR?m((yC7BT0y1wiAf7Ie6xdM3=;CMD;)I{Zn`Z}<C7oh4rKL$$h72(+$^STw`O7vV
z>VD-z>V@T9X>!<rD(cJX;UE?baxhHsN%eGak)B~vwyHI&Qu<Qg%I)NHR=%KqHE!r!
Vl@D7X5OAih53e+k>Kt`w`VSB^a9;ob

delta 351
zcmdmWlJW6zM)r%Jc)64|M{Q((6Fd1<q8c|F0|SFI5EnmWm~0RiQs2zTP{Y6w&&^Q6
zz>vwqkix<M72ySmXYzqbUWO88hD?5j6jrD#h%3O5!Up0tvoJ7%Gz&5`Gl0z!0_zcC
z$P@-MxIu~-L59JFco9M(P{klMDGUt38tju>;&mk0fll=CH*qoab1&uqvI9d6Llo?+
z>?hximuAusom?0yJXt0ob8=UL3ZwJnTS-0&l}tcSNdT2HFiJD>F>*4BGYK&YF-kBB
zGx0MDGYU^OOAh1z0hF!)DFk8$Hpa<Y5@(4?1DOHF!6C*$&K{w@3SoK*#(IW&larGU
hGj>f@Pflh14^+@Od1CTb#{ZM;_-rS)q?j@a0st9uOML(U

diff --git a/oyoyo/client.py b/oyoyo/client.py
index cf04f36..e409117 100644
--- a/oyoyo/client.py
+++ b/oyoyo/client.py
@@ -129,14 +129,13 @@ class IRCClient:
             self.socket.send(msg + bytes("\r\n", "ascii"))
         except socket.error, se:
             try:  # a little dance of compatibility to get the errno
-                errno = e.errno
+                errno = se.errno
             except AttributeError:
-                errno = e[0]                    
+                errno = se[0]                    
             if not self.blocking and errno == 11:
-                print "O WELLS"
                 pass
             else:
-                raise e
+                raise se
 
     def connect(self):
         """ initiates the connection to the server set in self.host:self.port 
@@ -192,7 +191,13 @@ class IRCClient:
                             pass 
 
                 yield True
-        finally:
+        except socket.error, se:
+            if self.socket: 
+                logging.info('closing socket')
+                self.socket.close()
+            print se
+            raise se
+        else:
             if self.socket: 
                 logging.info('closing socket')
                 self.socket.close()
diff --git a/oyoyo/client.pyc b/oyoyo/client.pyc
index 9fe81f2c87bc6e6f86fa5470d0d829214a6c21a9..48a8429a0296d7b62de5f2c742373bc426c626ae 100644
GIT binary patch
delta 598
zcma)2&ubG=5T4oWZn~RIb(7FGCf3;45>k+j9$LXlENY8Flr6Ls{6U+f?bfnO-K`Kv
zE!ayb3gVnRcoW3l<X!y>iXw`7@YI6`#as0ca9&#P9%h)C@0)qw_ugNBdL#aEKWW}9
z-+2?iV&Mx>v(DniBB)Ukyd$t|LNE)6>s^4YB(%H0I|}Ot%=pKdVs~(xaYTk124orY
z6~NgxfR_R*V6bgK!-Qo80u^xed58K44`_`9OqDDE2zL~KLfG^hg}H*zx{I+`t(2w_
z`w8vZ9y(MRs+y;nI4{W#Jxo=ys!~VpOpb1jx<vSKXo=m_Z`|;&u|!o0mM+dq7Y3_g
zVJZaufDu<HMQ`H2v6q8Q0QBX+fQd;?Qfc|n(EseQ)u~c~rHK7Z9W!A^*-8+4{$e2v
z>i3#ajl7;U-C>Gbq3=Dn^U{DD=M?Fj=GPV$n)f5=tm!&*t9MvGBMBp&FBs+WF-JH}
zpL!=POrwcOv{AzZ9qSuY#~Gsw`3X%H@90&ZqstX{obKi>(?B*8D;rgDE~_i}g{rwF
z{7kQNd-zRk=eHEx6X_Fq1%C<WWJ|$|v{M|$QTkeZi<gK_EooIg_2=2(5A3I(gJZgE
S-8p$#yUOJU@nC2g@#SBnvwVI4

delta 510
zcmX9&O=uHQ82r9XcH@g#V`6`@Y}ANp2&9yxJyj^Ep|;eL$`;y+<Y2RDyRl@^w>?Bs
zM04>{5x$!T1&`k9I|<$ep{NJFc=046il9d?elH&8G2hHEZysMeT1kBPZ6~kxZX71A
zr0}_Fq-OBmF2o}nf;4oJ5H<mE{}^D;hUg>&8Q2%F-aXBc?9k7!kI0rUz+taz0B-aF
zf>V$R#{l~R{3LV?2nC>j92ORDKON>D;Qy?jg4MDO0P=+aP>^l)*DlA>GQrYHVSRpi
zd9_g<p;G3+M3&n0GSk5trDGSVnH4xq+u53HV%%tHTQE*AS`1m_!n^7)`v<3ZogNj3
z@C;zY4E3x5^1z`SxG(^~E(;sJQ2Eggjx^-3X*ZNXce^0N)~$9#PsaAF8kc+1G&<gN
z^?#n88d>~o?rm+g?|4-$*67iA1!wfo<SYvZ47o%iw@A(0T)fUF-On$Wn!KU!xvHg8
zUY!cg^;kt*P<_WT@I4LO9ehVW+%Nc19pxVy_*t!;%^Ubt$#XpeFVoNS6`Uof_!_J9
kskmca;+kJnpZJCjO_t^?eS0^#cHUfK`c}Ovtsy@92f-_F9smFU

diff --git a/oyoyo/helpers.pyc b/oyoyo/helpers.pyc
index d325c7895d2159a610d11eab2f624161db0f0402..d3283befb359c2b3928b642dc02273da2ec92bb8 100644
GIT binary patch
delta 16
XcmbQEK1ZGX;wN6NZuYp1>{EpSGzSH^

delta 16
YcmbQEK1ZGX;wN4%rOi<r*{2Ev05u#1_W%F@

diff --git a/parsetools.pyc b/parsetools.pyc
index 01ad7d32f2be1357857c3eaa6658f56cc684cf45..ded990b8bd964afd44c590835edda42d3dfeee7a 100644
GIT binary patch
delta 16
XcmaDH_Bf3F;wN4%&-Kw8*<-W;LpBEH

delta 16
XcmaDH_Bf3F;wN4%rOi<r*<-W;LO2G(

diff --git a/pesterchum-update.nsi b/pesterchum-update.nsi
index c9415b5..a47de7c 100644
--- a/pesterchum-update.nsi
+++ b/pesterchum-update.nsi
@@ -3,7 +3,7 @@
 Name "PESTERCHUM3.14a"
 
 ; The file to write
-OutFile "pesterchum3.14a.2update.exe"
+OutFile "pesterchum3.14a.3update.exe"
 
 RequestExecutionLevel admin
 
diff --git a/pesterchum.nsi b/pesterchum.nsi
index 864e9a1..3e73fd6 100644
--- a/pesterchum.nsi
+++ b/pesterchum.nsi
@@ -3,7 +3,7 @@
 Name "PESTERCHUM3.14a"
 
 ; The file to write
-OutFile "pesterchum3.14a.1.exe"
+OutFile "pesterchum3.14a.3.exe"
 
 InstallDir C:\Pesterchum
 
diff --git a/pesterchum.py b/pesterchum.py
index 011db73..129267a 100644
--- a/pesterchum.py
+++ b/pesterchum.py
@@ -1675,10 +1675,17 @@ class IRCThread(QtCore.QThread):
                 irc.IRCConnect()
             try:
                 irc.updateIRC()
-            except socket.error:
-                irc.setConnectionBroken()
+            except socket.error, se:
+                if irc.connectedIRC:
+                    irc.setConnectionBroken()
+                else:
+                    irc.closeConnection()
+                    self.failedIRC.emit()
+            except StopIteration:
+                pass
 
     restartIRC = QtCore.pyqtSignal()
+    failedIRC = QtCore.pyqtSignal()
 
 class PesterTray(QtGui.QSystemTrayIcon):
     def __init__(self, icon, mainwindow, parent):
@@ -1750,6 +1757,8 @@ class MainProgram(QtCore.QObject):
         self.ircapp = IRCThread(self.irc)
         self.connect(self.ircapp, QtCore.SIGNAL('restartIRC()'),
                      self, QtCore.SLOT('restartIRC()'))
+        self.connect(self.ircapp, QtCore.SIGNAL('failedIRC()'),
+                     self, QtCore.SLOT('failedIRC()'))
 
     def connectWidgets(self, irc, widget):
         irc.connect(widget, QtCore.SIGNAL('sendMessage(QString, QString)'),
@@ -1857,22 +1866,54 @@ class MainProgram(QtCore.QObject):
                     widget,
                     QtCore.SLOT('timeCommand(QString, QString, QString)'))
 
+    @QtCore.pyqtSlot()
+    def tryAgain(self):
+        self.ircapp.irc.closeConnection()
+        self.ircapp.irc.IRCConnect()
+        labeltxt = self.widget.loadingscreen.loadinglabel.text()
+        if labeltxt != "R3CONN3CT1NG":
+            self.widget.loadingscreen.loadinglabel.setText("R3CONN3CTING")
+        elif labeltxt[0:12] == "R3CONN3CT1NG":
+            i = int(labeltxt[13:])
+            self.widget.loadingscreen.loadinglabel.setText("R3CONN3CTING %d" (i+1))
+
     @QtCore.pyqtSlot()
     def restartIRC(self):
+        # tell ppl that we're restarting
         self.widget.show()
         self.widget.activateWindow()
         self.widget.loadingscreen = LoadingScreen(self.widget)
         self.connect(self.widget.loadingscreen, QtCore.SIGNAL('rejected()'),
                      self.widget, QtCore.SLOT('close()'))
+        self.connect(self.widget.loadingscreen, QtCore.SIGNAL('tryAgain()'),
+                     self, QtCore.SLOT('tryAgain()'))                     
         status = self.widget.loadingscreen.exec_()
         if status == QtGui.QDialog.Rejected:
             sys.exit(0)
+    @QtCore.pyqtSlot()
+    def failedIRC(self):
+        self.widget.show()
+        self.widget.activateWindow()
+        if not self.widget.loadingscreen:
+            self.widget.loadingscreen = LoadingScreen(self.widget)
+            self.widget.loadingscreen.loadinglabel.setText("F41L3D")
+            self.connect(self.widget.loadingscreen, QtCore.SIGNAL('rejected()'),
+                         self.widget, QtCore.SLOT('close()'))
+            self.connect(self.widget.loadingscreen, QtCore.SIGNAL('tryAgain()'),
+                         self, QtCore.SLOT('tryAgain()'))                     
+            status = self.widget.loadingscreen.exec_()
+            if status == QtGui.QDialog.Rejected:
+                sys.exit(0)
+        else:
+            self.widget.loadingscreen.loadinglabel.setText("F41L3D")
 
     def run(self):
         self.ircapp.start()
         self.widget.loadingscreen = LoadingScreen(self.widget)
         self.connect(self.widget.loadingscreen, QtCore.SIGNAL('rejected()'),
                      self.widget, QtCore.SLOT('close()'))
+        self.connect(self.widget.loadingscreen, QtCore.SIGNAL('tryAgain()'),
+                     self, QtCore.SLOT('tryAgain()'))                     
         status = self.widget.loadingscreen.exec_()
         if status == QtGui.QDialog.Rejected:
             sys.exit(0)