From 16bda49e0667f77f4ebe1d8fa2682abf57aa6765 Mon Sep 17 00:00:00 2001
From: Tannin <devnull@localhost>
Date: Sat, 25 May 2013 12:24:48 +0200
Subject: - bugfix: mod priority ordering could become incorrect - bugfix: when
 grouping is enabled, newly installed mods broke grouping - bugfix: syncing
 overwrite didn't clean up emptied directory

---
 src/shared/directoryentry.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/shared')

diff --git a/src/shared/directoryentry.cpp b/src/shared/directoryentry.cpp
index abf9affb..9958b934 100644
--- a/src/shared/directoryentry.cpp
+++ b/src/shared/directoryentry.cpp
@@ -192,7 +192,6 @@ void FileEntry::addOrigin(int origin, FILETIME fileTime, const std::wstring &arc
     m_Origin = origin;
     m_FileTime = fileTime;
     m_Archive = archive;
-//  } else if (FilesOrigin::getByID(origin).getPriority() > FilesOrigin::getByID(m_Origin).getPriority()) {
   } else if (m_Parent->getOriginByID(origin).getPriority() > m_Parent->getOriginByID(m_Origin).getPriority()) {
     if (std::find(m_Alternatives.begin(), m_Alternatives.end(), m_Origin) == m_Alternatives.end()) {
       m_Alternatives.push_back(m_Origin);
@@ -269,7 +268,10 @@ bool FileEntry::removeOrigin(int origin)
 // sorted by priority descending
 static bool ByOriginPriority(DirectoryEntry *entry, int LHS, int RHS)
 {
-  return entry->getOriginByID(LHS).getPriority() < entry->getOriginByID(RHS).getPriority();
+  int l = entry->getOriginByID(LHS).getPriority(); if (l < 0) l = INT_MAX;
+  int r = entry->getOriginByID(RHS).getPriority(); if (r < 0) r = INT_MAX;
+
+  return l < r;
 }
 
 
-- 
cgit v1.3.1


From aadd076269cc3e09896bb1da554bd1a358a276c5 Mon Sep 17 00:00:00 2001
From: Tannin <devnull@localhost>
Date: Tue, 28 May 2013 23:14:49 +0200
Subject: - added hook for ansi version of SHFileOperation, this function may
 not be routed to the unicode version in every windows variant

---
 src/shared/util.cpp | 13 +++++++++++++
 src/shared/util.h   |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'src/shared')

diff --git a/src/shared/util.cpp b/src/shared/util.cpp
index e61ae8a6..1c4bf5b6 100644
--- a/src/shared/util.cpp
+++ b/src/shared/util.cpp
@@ -28,6 +28,19 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 namespace MOShared {
 
 
+bool FileExists(const std::string &filename)
+{
+  WIN32_FIND_DATAA findData;
+  ZeroMemory(&findData, sizeof(WIN32_FIND_DATAA));
+  HANDLE search = ::FindFirstFileExA(filename.c_str(), FindExInfoStandard, &findData, FindExSearchNameMatch, NULL, 0);
+  if (search == INVALID_HANDLE_VALUE) {
+    return false;
+  } else {
+    FindClose(search);
+    return true;
+  }
+}
+
 bool FileExists(const std::wstring &filename)
 {
   WIN32_FIND_DATAW findData;
diff --git a/src/shared/util.h b/src/shared/util.h
index 80983cb0..4af1fb1e 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -30,7 +30,7 @@ namespace MOShared {
 
 static const int MAXPATH_UNICODE = 32767;
 
-
+bool FileExists(const std::string &filename);
 bool FileExists(const std::wstring &filename);
 
 bool FileExists(const std::wstring &searchPath, const std::wstring &filename);
-- 
cgit v1.3.1