checkpoint

Shin0by · May 17, 2021 · ebd9641 · ebd9641
1 parent 87f1921
commit ebd9641
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 12 deletions.
diff --git a/StarCitizen Helper/Controls/WL_Pack.vb b/StarCitizen Helper/Controls/WL_Pack.vb
@@ -284,9 +284,13 @@ Public Class WL_Pack
 
             If Me.WL_PackUpdateCheck.Property_URLApi <> Property_PackageGitURL_Api Then
                 If InvokeRequired Then
-                    Me.Invoke(Sub() Me.List_Git.Items.Clear())
+                    Me.Invoke(Sub()
+                                  Me.List_Git.Items.Clear()
+                                  Me.Enabled = False
+                              End Sub)
                 Else
                     Me.List_Git.Items.Clear()
+                    Me.Enabled = False
                 End If
                 Me.WL_PackUpdateCheck.Property_URLApi = Property_PackageGitURL_Api
                 Me.WL_PackUpdateCheck.Property_GitListAutoUpdate = False
@@ -313,7 +317,6 @@ Public Class WL_Pack
         End Set
     End Property
 
-
     Public Property Property_GitList_SelString() As String
         Get
             Return Me.sGitList_Value
@@ -519,6 +522,7 @@ Finalize: sender.Enabled = True
 
     Private Sub UpdateListGit()
         RaiseEvent _Event_ListGit_List_Change_Before()
+
         Me.Invoke(Sub() Me.List_Git.Items.Clear())
         For i = 0 To Me.GIT_PACK_DATA._GetAll.Count - 1
             Me.Invoke(Sub() Me.List_Git.Items.Add(Me.GIT_PACK_DATA._GetAll.Item(i)._name))
@@ -564,6 +568,7 @@ Finalize: sender.Enabled = True
             _JSETTINGS._SetValue("configuration.external", "alert_date", _VARS.PackageLatestDate.ToString, True)
         End If
 
+        Me.Invoke(Sub() Me.Enabled = True)
         UpdateListGit()
     End Sub
 

diff --git a/StarCitizen Helper/Forms/MainForm.vb b/StarCitizen Helper/Forms/MainForm.vb
@@ -2,6 +2,7 @@
 
 Public Class MainForm
     Dim FirstRun As Boolean = True
+    Dim LatestSysUpdateVersion As String = Nothing
     '<----------------------------------- Form
     Private Sub MainForm_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Me.CheckBox_StartUp_CheckedChanged(Me, e)
@@ -363,6 +364,7 @@ Public Class MainForm
         Dim AlertType As Byte = 0
         If _VARS.AlertWindows = False Then AlertType = 2
 
+        Dim CurrentSysUpdateVersion = LatestElement._tag_name
         SubLine.Value = "Версия: " & LatestElement._tag_name
         SubLine.List.Add("Дата: " & LatestElement._published)
         SubLine.List.Add("")
@@ -382,14 +384,17 @@ Public Class MainForm
                                   Me.WL_AppUpdate.Property_PatchDstParameters = _VARS.SetupParameters
 
                                   Me.WL_AppUpdate.Enabled = True
-                                  If WL_AppUpdate.Enabled = True Then Me.TabControl.SelectedTab = Me.TabPage_SysUpdate
+                                  If Me.LatestSysUpdateVersion <> CurrentSysUpdateVersion Then
+                                      If WL_AppUpdate.Enabled = True Then Me.TabControl.SelectedTab = Me.TabPage_SysUpdate
+                                  End If
                               End Sub)
                 End If
 
                 ListSubLine.Add(SubLine)
 
 
-                _LOG._Add(Me.GetType().Name, _LANG._Get("l_NewVersionAvailable", SenderName.Property_Name), ListSubLine, AlertType, 0)
+                If Me.LatestSysUpdateVersion <> CurrentSysUpdateVersion Then _LOG._Add(Me.GetType().Name, _LANG._Get("l_NewVersionAvailable", SenderName.Property_Name), ListSubLine, AlertType, 0)
+                Me.LatestSysUpdateVersion = CurrentSysUpdateVersion
             End If
         End If
         If SenderName.Name = "WL_PackUpdateCheck" Then

diff --git a/StarCitizen Helper/Forms/MsgForm.vb b/StarCitizen Helper/Forms/MsgForm.vb
@@ -119,15 +119,19 @@ Public Class MsgForm
             Dim Size As Size = TextRenderer.MeasureText(RichTextBox.Text, RichTextBox.Font)
 
             RichTextBox.Width = Size.Width
-            RichTextBox.Height = Size.Height
+            RichTextBox.Height = Size.Height + 20
 
             If RichTextBox.Width < Me.MinimumSize.Width - RichTextBox.Left - 32 Then RichTextBox.Width = Me.MinimumSize.Width - RichTextBox.Left
             'If RichTextBox.Height < Me.MinimumSize.Height - RichTextBox.Top - Footer.Height Then RichTextBox.Height = Me.MinimumSize.Height - RichTextBox.Top - Footer.Height
-            If RichTextBox.Height > 500 - RichTextBox.Top - Footer.Height Then RichTextBox.Height = 500 - RichTextBox.Top - Footer.Height
-                If RichTextBox.Width > 800 - RichTextBox.Left Then
+
+            If RichTextBox.Height > 500 - RichTextBox.Top - Footer.Height Then
+                RichTextBox.Height = 500 - RichTextBox.Top - Footer.Height
+            End If
+
+            If RichTextBox.Width > 800 - RichTextBox.Left Then
                     RichTextBox.Width = 800 - RichTextBox.Left
-                    RichTextBox.Height = 500 - RichTextBox.Top - Footer.Height
-                End If
+                'RichTextBox.Height = 500 - RichTextBox.Top - Footer.Height
+            End If
             End If
 
             Dim FormSize As Size

diff --git a/StarCitizen Helper/My Project/AssemblyInfo.vb b/StarCitizen Helper/My Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.8.16.108")>
-<Assembly: AssemblyFileVersion("1.8.16.108")>
+<Assembly: AssemblyVersion("1.8.16.110")>
+<Assembly: AssemblyFileVersion("1.8.16.110")>
diff --git a/install/package/Input/StarCitizen Helper.exe b/install/package/Input/StarCitizen Helper.exe
diff --git a/install/package/Output/mysetup.exe b/install/package/Output/mysetup.exe
diff --git a/install/package/install.iss b/install/package/install.iss
@@ -1,6 +1,6 @@
 
 [Setup]
-AppVersion=1.8.16.108
+AppVersion=1.8.16.110
 AppName=StarCitizen Helper
 DefaultDirName={userappdata}\StarCitizen Helper
 DefaultGroupName=StarCitizen Helper

diff --git a/install/setup.exe b/install/setup.exe