From 7822c3690bbe290ac2a4ce7fb9c73071d3991886 Mon Sep 17 00:00:00 2001
From: Rinaldus <forreg@rinaldus.ru>
Date: Sun, 19 Nov 2017 18:35:54 +0300
Subject: [PATCH] The program didn't work when account didn't exist. Also fixed
 crash when the program tried to load incorrect mail headers

---
 mail-notifier.py | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/mail-notifier.py b/mail-notifier.py
index 0fe8b0e..1d93807 100755
--- a/mail-notifier.py
+++ b/mail-notifier.py
@@ -87,6 +87,12 @@ class Window(QDialog):
         self.ui.btnSaveAccount.clicked.connect(self.btnSaveAccount_clicked)
         self.ui.btnRemoveAccount.clicked.connect(self.btnRemoveAccount_clicked)
         
+        # Check if account doesn't exist, it creates default one
+        if (AccountExist() == False):
+            self.ui.comboAccounts.addItem("Default")
+            self.ui.comboAccounts.setCurrentText("Default")
+                
+        
         # Main timer
         self.timer = QTimer(self)
         self.timer.timeout.connect(mail_check)
@@ -208,6 +214,10 @@ class Window(QDialog):
             GroupName = self.ui.comboAccounts.currentText()
             self.ui.comboAccounts.removeItem(Index)
             self.SettingsRemove(GroupName)
+        # Check if account doesn't exist, it creates default one
+        if (AccountExist() == False):
+            self.ui.comboAccounts.addItem("Default")
+            self.ui.comboAccounts.setCurrentText("Default")
             
     def comboAccounts_changed(self):
         self.ui.lblTestOutput.setText("")
@@ -420,13 +430,17 @@ def mail_check():
         details.ui.tableWidget.setRowCount(len(AllFroms))
         details.ui.tableWidget.setColumnCount(3)
         #Enter data onto Table
-        horHeaders = []
-        for n, key in enumerate(sorted(data.keys())):
-            #print(data.keys())
-            horHeaders.append(key)
-            for m, item in enumerate(data[key]):
-                newitem = QtWidgets.QTableWidgetItem(item)
-                details.ui.tableWidget.setItem(m, n, newitem)
+        try:
+            horHeaders = []
+            for n, key in enumerate(sorted(data.keys())):
+                #print(data.keys())
+                horHeaders.append(key)
+                for m, item in enumerate(data[key]):
+                    newitem = QtWidgets.QTableWidgetItem(item)
+                    details.ui.tableWidget.setItem(m, n, newitem)
+        except:
+            print("Unable to load some data")
+            pass
         
         #Add Header
         details.ui.tableWidget.setHorizontalHeaderLabels(horHeaders)