From c4808063b175a28f87516cf3bc413188649604e1 Mon Sep 17 00:00:00 2001
From: BuildTools <Jasprose@protonmail.com>
Date: Fri, 2 Apr 2021 17:19:18 +0200
Subject: [PATCH] "Fixed" crash when closing certain windows. Only seemed to
 happen on mac and linux installations with older versions of glibc.

---
 CHANGELOG.md  | 3 +++
 TODO.md       | 9 ++-------
 convo.py      | 9 ++++++++-
 pesterchum.py | 2 +-
 version.py    | 4 ++--
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f94b66..a6bfeb1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Changelog
 (This document uses YYYY-MM-DD as per ISO 8601)
 
+## [v2.0.2] - 2021-4-2
+- "Fixed" crash when closing certain windows on certain platforms.
+
 ## [v2.0.1] - 2021-4-1
 - Fixed encoding-related crash
 
diff --git a/TODO.md b/TODO.md
index 110dcdc..03c0398 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,12 +1,7 @@
 # TODO LIST : )
-~~Crossed out~~ entries are completed :3c
 ## ADD
  - A proper prompt for choosing a server.
 
 ## FIX
-- ~~Pesterchum gets stuck on the system tray even after shutdown on windows.~~
-- Audio mixer slider in options doesn't always work. (Not working on linux?)
-- ~~QUIT not send to server on shutdown.~~
-- ~~TLS randomly causing socket to break.~~
-- Make setup.py work with 32-bit python.
-- Make setup.py work with py2app (might not be required if pyinstaller works better!!).
\ No newline at end of file
+- Audio mixer slider in options doesn't always work.
+- Any remaining unicode-related crashes.
\ No newline at end of file
diff --git a/convo.py b/convo.py
index 2828022..c1fb1ec 100644
--- a/convo.py
+++ b/convo.py
@@ -243,7 +243,14 @@ class PesterTabWindow(QtWidgets.QFrame):
     def tabClose(self, i):
         handle = str(self.tabs.tabText(i))
         self.mainwindow.waitingMessages.messageAnswered(handle)
-        convo = self.convos[handle]
+        #print(self.convos.keys())
+        # I, legit don' t know why this is an issue, but, uh, yeah-
+        try:
+            convo = self.convos[handle]
+        except:
+            #handle = handle.replace("&","")
+            handle = ''.join(handle.split('&', 1))
+            convo = self.convos[handle]
         del self.convos[handle]
         del self.tabIndices[handle]
         self.tabs.removeTab(i)
diff --git a/pesterchum.py b/pesterchum.py
index fd084be..2edc1bf 100644
--- a/pesterchum.py
+++ b/pesterchum.py
@@ -3022,7 +3022,7 @@ class MainProgram(QtCore.QObject):
             # Back to our scheduled program.
 
         self.app = QtWidgets.QApplication(sys.argv)
-        self.app.setApplicationName("Pesterchum " + _pcVersion)
+        self.app.setApplicationName("Pesterchum")
         self.app.setQuitOnLastWindowClosed(False)
 
         options = self.oppts(sys.argv[1:])
diff --git a/version.py b/version.py
index ec71261..907f8a4 100644
--- a/version.py
+++ b/version.py
@@ -1,2 +1,2 @@
-_pcVersion = "Alt. v2.0.1"
-buildVersion = "v2.0.1"
+_pcVersion = "Alt. v2.0.2"
+buildVersion = "v2.0.2"