Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/ClusterM/hakchi2.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com>2017-05-17 23:54:33 +0300
committerAlexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com>2017-05-18 00:41:57 +0300
commit2ccd2a52ce3a24d278b372ec09e0bd69e151b2ed (patch)
treef50f26f1ddb866fa28f260b69a8b222a731a7c2b /SelectModsForm.cs
parentec5328aa42fdc72de4b79fcf1b39046d6b85360d (diff)
Fix for mods installer
Diffstat (limited to 'SelectModsForm.cs')
-rw-r--r--SelectModsForm.cs8
1 files changed, 3 insertions, 5 deletions
diff --git a/SelectModsForm.cs b/SelectModsForm.cs
index 4034949a..7b16803e 100644
--- a/SelectModsForm.cs
+++ b/SelectModsForm.cs
@@ -11,15 +11,13 @@ namespace com.clusterrr.hakchi_gui
{
public partial class SelectModsForm : Form
{
- private readonly string baseDirectory;
private readonly string usermodsDirectory;
private readonly string[] readmeFiles;
public SelectModsForm(bool loadInstalledMods, bool allowDropMods, string[] filesToAdd = null)
{
InitializeComponent();
- baseDirectory = Program.BaseDirectoryExternal;
- usermodsDirectory = Path.Combine(baseDirectory, "user_mods");
+ usermodsDirectory = Path.Combine(Program.BaseDirectoryExternal, "user_mods");
var modsList = new List<string>();
if (loadInstalledMods && MainForm.Clovershell.IsOnline)
{
@@ -98,7 +96,7 @@ namespace com.clusterrr.hakchi_gui
}
else if (File.Exists(dir))
{
- SevenZipExtractor.SetLibraryPath(Path.Combine(baseDirectory, IntPtr.Size == 8 ? @"tools\7z64.dll" : @"tools\7z.dll"));
+ SevenZipExtractor.SetLibraryPath(Path.Combine(Program.BaseDirectoryInternal, IntPtr.Size == 8 ? @"tools\7z64.dll" : @"tools\7z.dll"));
using (var szExtractor = new SevenZipExtractor(dir))
{
var tar = new MemoryStream();
@@ -163,7 +161,7 @@ namespace com.clusterrr.hakchi_gui
}
else if (ext == ".7z" || ext == ".zip" || ext == ".rar")
{
- SevenZipExtractor.SetLibraryPath(Path.Combine(baseDirectory, IntPtr.Size == 8 ? @"tools\7z64.dll" : @"tools\7z.dll"));
+ SevenZipExtractor.SetLibraryPath(Path.Combine(Program.BaseDirectoryInternal, IntPtr.Size == 8 ? @"tools\7z64.dll" : @"tools\7z.dll"));
using (var szExtractor = new SevenZipExtractor(file))
{
foreach (var f in szExtractor.ArchiveFileNames)