diff --git a/StarCitizen Helper/Controls/WL_Modification.vb b/StarCitizen Helper/Controls/WL_Modification.vb index d0ff275..c6be389 100644 --- a/StarCitizen Helper/Controls/WL_Modification.vb +++ b/StarCitizen Helper/Controls/WL_Modification.vb @@ -385,7 +385,9 @@ Finalize: If Me.sGameExeFileName IsNot Nothing Then Dim _USER As New Class_INI _USER.SkipInvalidLines = True _USER._FSO = MAIN_THREAD.WL_Mod.Property_GameUserCfgFilePath - _USER._Write(Nothing, _VARS.g_language, Me.Localization, _VARS.utf8NoBom) + If _USER._Write(Nothing, _VARS.g_language, Me.Localization, System.Text.Encoding.UTF8) = False Then _LOG._sAdd("LoadUserCfgFile", _LANG._Get("File_MSG_CannotWriteCheckPermission", MAIN_THREAD.WL_Mod.Property_GameUserCfgFilePath),, 1) : Exit Sub + If _USER._Write(Nothing, _VARS.g_languageAudio, "english", System.Text.Encoding.UTF8) = False Then _LOG._sAdd("LoadUserCfgFile", _LANG._Get("File_MSG_CannotWriteCheckPermission", MAIN_THREAD.WL_Mod.Property_GameUserCfgFilePath),, 1) : Exit Sub + _Update() @@ -406,7 +408,7 @@ Finalize: If Me.sGameExeFileName IsNot Nothing Then Dim _USER As New Class_INI _USER.SkipInvalidLines = True _USER._FSO = MAIN_THREAD.WL_Pack.Property_FilePath_User - _USER._Write(Nothing, _VARS.g_language, "", _VARS.utf8NoBom) + If _USER._Write(Nothing, _VARS.g_language, "", System.Text.Encoding.UTF8) = False Then _LOG._sAdd("LoadUserCfgFile", _LANG._Get("File_MSG_CannotWriteCheckPermission", MAIN_THREAD.WL_Mod.Property_GameUserCfgFilePath),, 1) : Exit Sub '_FSO._DeleteFile(Me.Property_PatchDstFilePath) diff --git a/StarCitizen Helper/Controls/WL_Pack.vb b/StarCitizen Helper/Controls/WL_Pack.vb index c0cf2ec..b40c377 100644 --- a/StarCitizen Helper/Controls/WL_Pack.vb +++ b/StarCitizen Helper/Controls/WL_Pack.vb @@ -625,13 +625,15 @@ Finalize: If result.Err._Flag = True Then Next If MAIN_THREAD.WL_Mod.Property_GameUserCfgFilePath IsNot Nothing Then + Dim _USER As New Class_INI() + _USER.SkipInvalidLines = True + _USER._FSO = MAIN_THREAD.WL_Mod.Property_GameUserCfgFilePath + If _FSO._FileExits(MAIN_THREAD.WL_Mod.Property_GameUserCfgFilePath) = False Then - _FSO._WriteTextFile(_VARS.g_language & " = ", MAIN_THREAD.WL_Mod.Property_GameUserCfgFilePath, System.Text.Encoding.UTF8) - Else - Dim _USER_CFG As New Class_INI() - _USER_CFG.SkipInvalidLines = True - _USER_CFG._FSO = MAIN_THREAD.WL_Mod.Property_GameUserCfgFilePath - _USER_CFG._Write(Nothing, _VARS.g_language, Nothing, _VARS.utf8NoBom) + If _USER._Write(Nothing, _VARS.g_language, "", System.Text.Encoding.UTF8) = False Then _LOG._sAdd("LoadUserCfgFile", _LANG._Get("File_MSG_CannotWriteCheckPermission", MAIN_THREAD.WL_Mod.Property_GameUserCfgFilePath),, 1) : Exit Sub + If _USER._Write(Nothing, _VARS.g_languageAudio, "english", System.Text.Encoding.UTF8) = False Then _LOG._sAdd("LoadUserCfgFile", _LANG._Get("File_MSG_CannotWriteCheckPermission", MAIN_THREAD.WL_Mod.Property_GameUserCfgFilePath),, 1) : Exit Sub + Else + _USER._Write(Nothing, _VARS.g_language, Nothing, _VARS.utf8NoBom) End If End If diff --git a/StarCitizen Helper/Modules/Module_HELPER.vb b/StarCitizen Helper/Modules/Module_HELPER.vb index a245239..c195e0f 100644 --- a/StarCitizen Helper/Modules/Module_HELPER.vb +++ b/StarCitizen Helper/Modules/Module_HELPER.vb @@ -156,7 +156,8 @@ Module Module_HELPER If _FSO._FileExits(MAIN_THREAD.WL_Mod.Property_GameUserCfgFilePath) = False Then - If _FSO._WriteTextFile(_VARS.g_language & " = ", MAIN_THREAD.WL_Mod.Property_GameUserCfgFilePath, System.Text.Encoding.UTF8) = False Then _LOG._sAdd("LoadUserCfgFile", _LANG._Get("File_MSG_CannotWriteCheckPermission", MAIN_THREAD.WL_Mod.Property_GameUserCfgFilePath),, 1) : Exit Sub + If _USER._Write(Nothing, _VARS.g_language, "", System.Text.Encoding.UTF8) = False Then _LOG._sAdd("LoadUserCfgFile", _LANG._Get("File_MSG_CannotWriteCheckPermission", MAIN_THREAD.WL_Mod.Property_GameUserCfgFilePath),, 1) : Exit Sub + If _USER._Write(Nothing, _VARS.g_languageAudio, "english", System.Text.Encoding.UTF8) = False Then _LOG._sAdd("LoadUserCfgFile", _LANG._Get("File_MSG_CannotWriteCheckPermission", MAIN_THREAD.WL_Mod.Property_GameUserCfgFilePath),, 1) : Exit Sub End If Dim _USER_CFG As New Class_INI() diff --git a/StarCitizen Helper/Modules/Module_MAIN.vb b/StarCitizen Helper/Modules/Module_MAIN.vb index 79623ec..9fbcc51 100644 --- a/StarCitizen Helper/Modules/Module_MAIN.vb +++ b/StarCitizen Helper/Modules/Module_MAIN.vb @@ -255,7 +255,6 @@ Module Module_MAIN Public OldPatcher_File_Name As String = Nothing Public LoginDataToken_SoureFileName As String = Nothing Public LoginDataToken_DestFileName As String = Nothing - Public g_language As String = "g_language" Public LocalizationFolderName As String = Nothing Public LanguageFolderDelimeter = Nothing Public LanguageFolderDefault = Nothing @@ -287,6 +286,10 @@ Module Module_MAIN Public URL_App_Api As String = Nothing Public URL_App_Release As String = Nothing + 'User.cfg + Public g_language As String = "g_language" + Public g_languageAudio As String = "g_languageAudio" + Public Property UpdateStatus() As String Get Return Me.sUpdateStatus diff --git a/StarCitizen Helper/My Project/AssemblyInfo.vb b/StarCitizen Helper/My Project/AssemblyInfo.vb index a6edae4..3a00e4e 100644 --- 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: ' - - + + diff --git a/install/package/Input/StarCitizen Helper.exe b/install/package/Input/StarCitizen Helper.exe index 9fb1234..0071135 100644 Binary files a/install/package/Input/StarCitizen Helper.exe and b/install/package/Input/StarCitizen Helper.exe differ diff --git a/install/package/Output/mysetup.exe b/install/package/Output/mysetup.exe index 0476f28..b5b94b2 100644 Binary files a/install/package/Output/mysetup.exe and b/install/package/Output/mysetup.exe differ diff --git a/install/package/install.iss b/install/package/install.iss index d4c79aa..da13b37 100644 --- a/install/package/install.iss +++ b/install/package/install.iss @@ -1,6 +1,6 @@ [Setup] -AppVersion=1.9.26.136 +AppVersion=1.9.26.137 AppName=StarCitizen Helper DefaultDirName={userappdata}\StarCitizen Helper DefaultGroupName=StarCitizen Helper diff --git a/install/setup.exe b/install/setup.exe index 0476f28..b5b94b2 100644 Binary files a/install/setup.exe and b/install/setup.exe differ