From a6a29e913afe1245815237fbf6aba49df7284c31 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 5 Dec 2023 00:40:08 +0300
Subject: [PATCH] =?UTF-8?q?fix.=20=D0=B2=D0=BE=20=D0=B2=D1=80=D0=B5=D0=BC?=
 =?UTF-8?q?=D1=8F=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=BE=D1=81=D0=B0=20?=
 =?UTF-8?q?=D0=B2=D0=BA=D0=BB=D0=B0=D0=B4=D0=BE=D0=BA=20=D1=81=20=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=BC=D0=BF=D0=B8=D0=BB=D1=8F=D1=86=D0=B8=D0=B5=D0=B9=20?=
 =?UTF-8?q?=D0=B8=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA=D0=BE=D0=BC=20?=
 =?UTF-8?q?=D1=81=D0=B1=D0=B8=D0=BB=20=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=82=D0=B5=D0=BA=D1=83=D1=89=D0=B8?=
 =?UTF-8?q?=D1=8A=20=D0=BC=D0=B0=D1=88=D0=B8=D0=BD=D1=8B=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8F=20?=
 =?UTF-8?q?=D0=B8=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=B8=D0=BB=D1=8F=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                        |  6 ++---
 src/GlobalData/GlobalDatabase.java         | 31 +++++++++++++---------
 src/Visual_DVM_2021/UI/Main/DebugForm.java |  9 -------
 src/Visual_DVM_2021/UI/Main/MainForm.java  |  2 ++
 4 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0121dc19..e1834f21 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,10 +7,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteTasksPackage.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestRunTasksMenuBar/TestRunTasksMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestRunTasksMenuBar/TestRunTasksMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/GlobalDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/DebugForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/DebugForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/GlobalData/GlobalDatabase.java b/src/GlobalData/GlobalDatabase.java
index e1921c7e..df909672 100644
--- a/src/GlobalData/GlobalDatabase.java
+++ b/src/GlobalData/GlobalDatabase.java
@@ -108,19 +108,24 @@ public class GlobalDatabase extends SQLiteDatabase {
     public PassCode_2021 getSynchronizePassCode() {
         return null;
     }
-    public void SaveCredentials() throws Exception {
-        Credentials credentials = (Credentials) Current.get(Current.Credentials);
-        if (Current.HasMachine())
-            credentials.machine_id = Current.getMachine().id;
-        if (Current.HasUser())
-            credentials.user_id = Current.getUser().id;
-        if (Current.HasCompiler())
-            credentials.compiler_id = Current.getCompiler().id;
-        if (Current.HasMakefile())
-            credentials.makefile_id = Current.getMakefile().id;
-        if (Current.HasRunConfiguration())
-            credentials.runconfiguration_id = Current.getRunConfiguration().id;
-        Update(credentials);
+    public void SaveCredentials(){
+        try {
+            Credentials credentials = (Credentials) Current.get(Current.Credentials);
+            if (Current.HasMachine())
+                credentials.machine_id = Current.getMachine().id;
+            if (Current.HasUser())
+                credentials.user_id = Current.getUser().id;
+            if (Current.HasCompiler())
+                credentials.compiler_id = Current.getCompiler().id;
+            if (Current.HasMakefile())
+                credentials.makefile_id = Current.getMakefile().id;
+            if (Current.HasRunConfiguration())
+                credentials.runconfiguration_id = Current.getRunConfiguration().id;
+            Update(credentials);
+        }
+        catch (Exception ex){
+            ex.printStackTrace();
+        }
     }
     public void UpdateCredentials() {
         try {
diff --git a/src/Visual_DVM_2021/UI/Main/DebugForm.java b/src/Visual_DVM_2021/UI/Main/DebugForm.java
index 9dd3d171..2f3135f6 100644
--- a/src/Visual_DVM_2021/UI/Main/DebugForm.java
+++ b/src/Visual_DVM_2021/UI/Main/DebugForm.java
@@ -37,15 +37,6 @@ public class DebugForm implements DebugWindow, FormWithSplitters {
         return content;
     }
     @Override
-    public void SaveSplitters() {
-        FormWithSplitters.super.SaveSplitters();
-        try {
-            Global.db.SaveCredentials();
-        } catch (Exception ex) {
-            Global.Log.PrintException(ex);
-        }
-    }
-    @Override
     public void DropRunTasksComparison() {
         singleRunTaskMaster.RemoveObject();
         singleRunTaskSlave.RemoveObject();
diff --git a/src/Visual_DVM_2021/UI/Main/MainForm.java b/src/Visual_DVM_2021/UI/Main/MainForm.java
index 9b7d2df2..e4415b5d 100644
--- a/src/Visual_DVM_2021/UI/Main/MainForm.java
+++ b/src/Visual_DVM_2021/UI/Main/MainForm.java
@@ -62,6 +62,8 @@ public class MainForm extends Form implements MainWindow {
         if (UI.debugWindow != null)
             ((FormWithSplitters) UI.debugWindow).SaveSplitters();
         //--
+        Global.db.SaveCredentials();
+        //--
         Global.FinishApplication();
     }
     public MainForm() {