From 80d6271d278b62927e4060f7037dbc3d30164fd0 Mon Sep 17 00:00:00 2001
From: BarsTiger <kit.barsic@gmail.com>
Date: Fri, 4 Feb 2022 11:29:56 +0200
Subject: [PATCH] Fixed changing password and email

---
 modules/auth.py  | 17 ++++++++++-------
 modules/login.py |  9 +++++----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/modules/auth.py b/modules/auth.py
index 0be021c..f1611a7 100644
--- a/modules/auth.py
+++ b/modules/auth.py
@@ -1,8 +1,9 @@
 import json
 import modules.vars as horsy_vars
+import ctypes
 
 
-def get_auth(is_gui=False, login_ui=None, Ui_LoginWindow=None, *args):
+def get_auth(is_gui=False, login_ui=None, Ui_LoginWindow=None):
     with open(horsy_vars.horsypath + 'config.cfg') as f:
         config = json.load(f)
 
@@ -26,13 +27,10 @@ def get_auth(is_gui=False, login_ui=None, Ui_LoginWindow=None, *args):
         else:
             login_ui.setupUi(Ui_LoginWindow)
             Ui_LoginWindow.show()
-            login_ui.login_button.clicked.connect(lambda: get_gui_auth(login_ui=login_ui,
-                                                                       Ui_LoginWindow=Ui_LoginWindow))
 
-    try:
-        args()
-    except:
-        pass
+            def load_login_now():
+                return get_gui_auth(login_ui, Ui_LoginWindow)
+            login_ui.login_button.clicked.connect(load_login_now)
 
 
 def get_gui_auth(login_ui, Ui_LoginWindow):
@@ -43,6 +41,11 @@ def get_gui_auth(login_ui, Ui_LoginWindow):
             config['auth'] = {'email': login_ui.email_box.text(), 'password': login_ui.password_box.text()}
             json.dump(config, f)
         Ui_LoginWindow.close()
+        try:
+            ctypes.windll.user32.MessageBoxW(0, "Login updated. To see it, restart horsygui",
+                                             "Reload to take effect", 0)
+        except:
+            pass
 
 
 def del_auth():
diff --git a/modules/login.py b/modules/login.py
index 248c6a8..08c57d2 100644
--- a/modules/login.py
+++ b/modules/login.py
@@ -10,9 +10,6 @@ def loginload():
     UiLoginWindow = QtWidgets.QMainWindow()
     login_ui = gui.Ui_LoginWindow()
     login_ui.setupUi(UiLoginWindow)
-    UiMainWindow = QtWidgets.QMainWindow()
-    ui = gui.Ui_MainWindow()
-    ui.setupUi(UiMainWindow)
     try:
         with open(horsy_vars.horsypath + 'config.cfg') as f:
             config = json.load(f)
@@ -28,6 +25,9 @@ def login():
     UiLoginWindow = QtWidgets.QMainWindow()
     login_ui = gui.Ui_LoginWindow()
     login_ui.setupUi(UiLoginWindow)
+    UiMainWindow = QtWidgets.QMainWindow()
+    ui = gui.Ui_MainWindow()
+    ui.setupUi(UiMainWindow)
     with open(horsy_vars.horsypath + 'config.cfg') as f:
         config = json.load(f)
     try:
@@ -38,4 +38,5 @@ def login():
         else:
             raise 'No auth'
     except:
-        auth = get_auth(True, login_ui, QtWidgets.QMainWindow(), loginload())  # TODO: fix this
+        print('It will return from login')
+        print(get_auth(True, login_ui, QtWidgets.QMainWindow()))