diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mainwindow.ui | 3 | ||||
| -rw-r--r-- | src/organizercore.cpp | 6 | ||||
| -rw-r--r-- | src/selfupdater.cpp | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/mainwindow.ui b/src/mainwindow.ui index e30a165d..b464a384 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -732,6 +732,9 @@ p, li { white-space: pre-wrap; } <property name="text">
<string>Sort</string>
</property>
+ <property name="visible">
+ <bool>false</bool>
+ </property>
<property name="icon">
<iconset resource="resources.qrc">
<normaloff>:/MO/gui/sort</normaloff>:/MO/gui/sort</iconset>
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;
}
}
diff --git a/src/selfupdater.cpp b/src/selfupdater.cpp index 3e98a5ec..d78b020b 100644 --- a/src/selfupdater.cpp +++ b/src/selfupdater.cpp @@ -106,7 +106,7 @@ SelfUpdater::SelfUpdater(NexusInterface *nexusInterface) m_MOVersion = VersionInfo(version.dwFileVersionMS >> 16,
version.dwFileVersionMS & 0xFFFF,
version.dwFileVersionLS >> 16,
- version.dwFileVersionLS & 0xFFFF);
+ version.dwFileVersionLS & 0xFFFF);
}
|