Merge branch 'Develop' of https://github.com/Modorganizer2/modorganizer into Develop

22 files changed, 2 insertions, 2 deletions

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index a79e42ba..0dbe4d53 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -3938,9 +3938,9 @@ void MainWindow::previewDataFile()
   // check if the file comes from the actual data folder instead of a mod

   QDir gameDirectory = m_OrganizerCore.managedGame()->dataDirectory().absolutePath();

   QString relativePath = gameDirectory.relativeFilePath(fileName);

-  QDir direRelativePath = gameDirectory.relativeFilePath(fileName);

+  QDir dirRelativePath = gameDirectory.relativeFilePath(fileName);

   // if the file is on a different drive the dirRelativePath will actually be an absolute path so we make sure that is not the case

-  if (!direRelativePath.isAbsolute() && !relativePath.startsWith("..")) {

+  if (!dirRelativePath.isAbsolute() && !relativePath.startsWith("..")) {

 	  fileName = relativePath;

   }

   else {

diff --git a/src/resources/archive-conflict-loser.png b/src/resources/archive-conflict-loser.png
index 77d2e0fa..561e8be8 100644
--- a/src/resources/archive-conflict-loser.png
+++ b/src/resources/archive-conflict-loser.png
diff --git a/src/resources/archive-conflict-mixed.png b/src/resources/archive-conflict-mixed.png
index e71e0167..df20532c 100644
--- a/src/resources/archive-conflict-mixed.png
+++ b/src/resources/archive-conflict-mixed.png
diff --git a/src/resources/archive-conflict-neutral.png b/src/resources/archive-conflict-neutral.png
index aba45314..5bedd9c4 100644
--- a/src/resources/archive-conflict-neutral.png
+++ b/src/resources/archive-conflict-neutral.png
diff --git a/src/resources/archive-conflict-winner.png b/src/resources/archive-conflict-winner.png
index f6260575..5cc568c8 100644
--- a/src/resources/archive-conflict-winner.png
+++ b/src/resources/archive-conflict-winner.png
diff --git a/src/resources/check.png b/src/resources/check.png
index 0f294a02..5df44755 100644
--- a/src/resources/check.png
+++ b/src/resources/check.png
diff --git a/src/resources/contents/breastplate.png b/src/resources/contents/breastplate.png
index d3d39407..f8c787e2 100644
--- a/src/resources/contents/breastplate.png
+++ b/src/resources/contents/breastplate.png
diff --git a/src/resources/contents/checkbox-tree.png b/src/resources/contents/checkbox-tree.png
index a44dd5fd..f4a63237 100644
--- a/src/resources/contents/checkbox-tree.png
+++ b/src/resources/contents/checkbox-tree.png
diff --git a/src/resources/contents/config.png b/src/resources/contents/config.png
index 3896d885..3aaa2e5c 100644
--- a/src/resources/contents/config.png
+++ b/src/resources/contents/config.png
diff --git a/src/resources/contents/conversation.png b/src/resources/contents/conversation.png
index 11030fff..76286e33 100644
--- a/src/resources/contents/conversation.png
+++ b/src/resources/contents/conversation.png
diff --git a/src/resources/contents/double-quaver.png b/src/resources/contents/double-quaver.png
index 7102f472..21dcf4c1 100644
--- a/src/resources/contents/double-quaver.png
+++ b/src/resources/contents/double-quaver.png
diff --git a/src/resources/contents/empty-chessboard.png b/src/resources/contents/empty-chessboard.png
index b5983010..fccb3aa5 100644
--- a/src/resources/contents/empty-chessboard.png
+++ b/src/resources/contents/empty-chessboard.png
diff --git a/src/resources/contents/hand-of-god.png b/src/resources/contents/hand-of-god.png
index e3a05335..7cbd0102 100644
--- a/src/resources/contents/hand-of-god.png
+++ b/src/resources/contents/hand-of-god.png
diff --git a/src/resources/contents/jigsaw-piece.png b/src/resources/contents/jigsaw-piece.png
index 0b26d56b..4949be40 100644
--- a/src/resources/contents/jigsaw-piece.png
+++ b/src/resources/contents/jigsaw-piece.png
diff --git a/src/resources/contents/locked-chest.png b/src/resources/contents/locked-chest.png
index d70d448e..b49e1165 100644
--- a/src/resources/contents/locked-chest.png
+++ b/src/resources/contents/locked-chest.png
diff --git a/src/resources/contents/lyre.png b/src/resources/contents/lyre.png
index 041dbb01..3adff24e 100644
--- a/src/resources/contents/lyre.png
+++ b/src/resources/contents/lyre.png
diff --git a/src/resources/contents/tinker.png b/src/resources/contents/tinker.png
index 9709cee8..dceb1367 100644
--- a/src/resources/contents/tinker.png
+++ b/src/resources/contents/tinker.png
diff --git a/src/resources/contents/usable.png b/src/resources/contents/usable.png
index 2bc93a7d..c705997a 100644
--- a/src/resources/contents/usable.png
+++ b/src/resources/contents/usable.png
diff --git a/src/resources/document-save.png b/src/resources/document-save.png
index a94e0eab..18e1f974 100644
--- a/src/resources/document-save.png
+++ b/src/resources/document-save.png
diff --git a/src/resources/multiply-red.png b/src/resources/multiply-red.png
index c238f07f..f35adc74 100644
--- a/src/resources/multiply-red.png
+++ b/src/resources/multiply-red.png
diff --git a/src/resources/open-Folder-Icon.png b/src/resources/open-Folder-Icon.png
index c363be0f..6218ed39 100644
--- a/src/resources/open-Folder-Icon.png
+++ b/src/resources/open-Folder-Icon.png
diff --git a/src/resources/switch-instance-icon.png b/src/resources/switch-instance-icon.png
index b992babe..cd509d3d 100644
--- a/src/resources/switch-instance-icon.png
+++ b/src/resources/switch-instance-icon.png