Merge pull request #69 from LePresidente/new_vfs_library

Bring in line with main branch

1 files changed, 13 insertions, 3 deletions

diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index 142c9eba..d9ed6ab6 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -703,6 +703,16 @@ QString OrganizerCore::downloadsPath() const
   return QDir::fromNativeSeparators(m_Settings.getDownloadDirectory());

 }

 

+QString OrganizerCore::overwritePath() const

+{

+  return QDir::fromNativeSeparators(m_Settings.getOverwriteDirectory());

+}

+

+QString OrganizerCore::basePath() const

+{

+  return QDir::fromNativeSeparators(m_Settings.getBaseDirectory());

+}

+

 MOBase::VersionInfo OrganizerCore::appVersion() const

 {

   return m_Updater.getVersion();

@@ -1243,7 +1253,7 @@ bool OrganizerCore::waitForProcessCompletion(HANDLE handle, LPDWORD exitCode)
   while (

       res = ::MsgWaitForMultipleObjects(1, &handle, false, 500,

                                         QS_KEY | QS_MOUSE),

-      ((res != WAIT_FAILED) && (res != WAIT_OBJECT_0)) &&

+      ((res != WAIT_FAILED) || (res != WAIT_OBJECT_0)) &&

        ((m_UserInterface == nullptr) || !m_UserInterface->unlockClicked())) {

 

     if (!::GetVFSProcessList(&numProcesses, processes)) {

@@ -1256,9 +1266,9 @@ bool OrganizerCore::waitForProcessCompletion(HANDLE handle, LPDWORD exitCode)
     for (size_t i = 0; i < count; ++i) {

       std::wstring processName = getProcessName(processes[i]);

       if (!boost::starts_with(processName, L"ModOrganizer.exe")) {

-        currentProcess = processes[i];

+		currentProcess = processes[i];

         m_UserInterface->setProcessName(QString::fromStdWString(processName));

-        processHandle = ::OpenProcess(SYNCHRONIZE, FALSE, currentProcess);

+		processHandle = ::OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, FALSE, currentProcess);

         found = true;

       }

     }