From c9766b6e1a5dc794f4f3dbd8d231537ef13b77a4 Mon Sep 17 00:00:00 2001 From: Brian Munro Date: Wed, 11 Jan 2017 15:47:09 +0200 Subject: Fixes the error code 5/6 issues --- src/organizercore.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/organizercore.cpp') diff --git a/src/organizercore.cpp b/src/organizercore.cpp index 142c9eba..55d3f494 100644 --- a/src/organizercore.cpp +++ b/src/organizercore.cpp @@ -1243,7 +1243,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 +1256,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; } } -- cgit v1.3.1 From 4149ce4cdb43fdf5c4ac6cd9cd317912fe40d683 Mon Sep 17 00:00:00 2001 From: ZachHaber Date: Tue, 17 Jan 2017 16:30:42 -0600 Subject: Fixing overwrite problems Changes the organizerproxy to pull from the settings rather than try and figure it out on its own. --- src/organizercore.cpp | 10 ++++++++++ src/organizercore.h | 2 ++ src/organizerproxy.cpp | 10 ++++++++-- src/organizerproxy.h | 1 + 4 files changed, 21 insertions(+), 2 deletions(-) (limited to 'src/organizercore.cpp') diff --git a/src/organizercore.cpp b/src/organizercore.cpp index 55d3f494..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(); diff --git a/src/organizercore.h b/src/organizercore.h index e994d9b1..297b94f6 100644 --- a/src/organizercore.h +++ b/src/organizercore.h @@ -165,6 +165,8 @@ public: QString profileName() const; QString profilePath() const; QString downloadsPath() const; + QString overwritePath() const; + QString basePath() const; MOBase::VersionInfo appVersion() const; MOBase::IModInterface *getMod(const QString &name) const; MOBase::IModInterface *createMod(MOBase::GuessedValue &name); diff --git a/src/organizerproxy.cpp b/src/organizerproxy.cpp index b6dbd242..cf2e29e3 100644 --- a/src/organizerproxy.cpp +++ b/src/organizerproxy.cpp @@ -37,9 +37,15 @@ QString OrganizerProxy::downloadsPath() const QString OrganizerProxy::overwritePath() const { - return QDir::fromNativeSeparators(qApp->property("dataPath").toString()) + /*return QDir::fromNativeSeparators(qApp->property("dataPath").toString()) + "/" - + ToQString(AppConfig::overwritePath()); + + ToQString(AppConfig::overwritePath());*/ + return m_Proxied->overwritePath(); +} + +QString OrganizerProxy::basePath() const +{ + return m_Proxied->basePath(); } VersionInfo OrganizerProxy::appVersion() const diff --git a/src/organizerproxy.h b/src/organizerproxy.h index 7d925482..7004db14 100644 --- a/src/organizerproxy.h +++ b/src/organizerproxy.h @@ -18,6 +18,7 @@ public: virtual QString profilePath() const; virtual QString downloadsPath() const; virtual QString overwritePath() const; + virtual QString basePath() const; virtual MOBase::VersionInfo appVersion() const; virtual MOBase::IModInterface *getMod(const QString &name) const; virtual MOBase::IModInterface *createMod(MOBase::GuessedValue &name); -- cgit v1.3.1