Fixed merge data path bug, updated changelog for 2.1.3

matortheeternal · Jan 5, 2016 · 2fe0a86 · 2fe0a86
1 parent 91a5b05
commit 2fe0a86
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 9 deletions.
diff --git a/backend/changelog.txt b/backend/changelog.txt
@@ -94,4 +94,19 @@ Version 2.1.2.0
   - Fixed issue with the Delete Merge confirmation box sometimes being hidden behind the main application window
   - The msFailed merge status is now immutable, as it should be.
   - Added a note in the documentation about Copy General Assets being on the Integrations tab
-  - Fixed a critical issue with Merge version in submitted reports having a leading space, which caused the loss of some reports that were submitted over the last few days.
+  - Fixed a critical issue with Merge version in submitted reports having a leading space, which caused the loss of some reports that were submitted over the last few days.
+
+Version 2.1.3.0
+  - Hotfix release
+  - Corrected load order bug for FO3/FNV/TES4 when not using MO
+  - Implemented Extract BSAs option (it did nothing before this update)
+  - Made documentation on the Resolve Issues Window
+  - Added Troubleshooting section to documentation
+  - Updated Merge Statuses section of the documentation
+  - Fixed Reset Errors being unavailable when a plugin had no errors
+  - Fixed changing the merge name not always updating its data path
+  - Fixed merge failure due to an access violation when using the New Records merging method
+  - Returned the limitation on the fails and files sections of the Merge Details view of 1000 items each
+  - When the merge destination directory is the data folder Merge Plugins will put merged assets directly into the folder instead of creating a subfolder for each merge
+  - Merge Plugins no longer breaks due to different regional Decimal Separator characters.
+  - Fixed the OK button of the Options Form not updating when changing the Merge destination directory
diff --git a/frontend/mpCore.pas b/frontend/mpCore.pas
@@ -658,13 +658,16 @@ procedure TMerge.GetStatus;
     exit;
   end;
 
-  // don't merge if mod destination directory is blank
+  // don't merge if merge destination directory is blank
   if (settings.mergeDirectory = '') then begin
     Logger.Write('MERGE', 'Status', name + ' -> Merge directory blank');
     status := msDirInvalid;
     exit;
   end;
 
+  // update the merge's datapath
+  UpdateDataPath;
+
   // don't merge if usingMO is true and MODirectory is blank
   if settings.usingMO and (settings.ManagerPath = '') then begin
     Logger.Write('MERGE', 'Status', name + ' -> Mod Organizer Directory blank');
@@ -724,9 +727,6 @@ procedure TMerge.GetStatus;
     end;
   end;
 
-  // update the merge's datapath
-  UpdateDataPath;
-
   // check plugins were modified or files were deleted before
   // giving merge the up to date status
   if (not PluginsModified) and FilesExist and (status = msUnknown) then begin

diff --git a/frontend/mpMergeForm.pas b/frontend/mpMergeForm.pas
@@ -2594,7 +2594,6 @@ procedure TMergeForm.ReportOnPluginsItemClick(Sender: TObject);
 procedure TMergeForm.OpenInExplorerItemClick(Sender: TObject);
 var
   i: Integer;
-  path: string;
   merge: TMerge;
 begin
   // loop through merges
@@ -2604,9 +2603,8 @@ procedure TMergeForm.OpenInExplorerItemClick(Sender: TObject);
     merge := TMerge(MergesList[i]);
 
     // open in explorer
-    path := settings.mergeDirectory + merge.name;
-    ForceDirectories(path);
-    ShellExecute(0, 'open', PChar(path), '', '', SW_SHOWNORMAL);
+    ForceDirectories(merge.dataPath);
+    ShellExecute(0, 'open', PChar(merge.dataPath), '', '', SW_SHOWNORMAL);
   end;
 end;