diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/loadmechanism.cpp | 4 | ||||
| -rw-r--r-- | src/mainwindow.cpp | 5 | ||||
| -rw-r--r-- | src/modinforegular.cpp | 2 | ||||
| -rw-r--r-- | src/organizercore.cpp | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/src/loadmechanism.cpp b/src/loadmechanism.cpp index a9d444d1..a2050512 100644 --- a/src/loadmechanism.cpp +++ b/src/loadmechanism.cpp @@ -129,7 +129,7 @@ void LoadMechanism::deactivateScriptExtender() throw MyException(QObject::tr("game doesn't support a script extender"));
}
- QDir pluginsDir(game->gameDirectory().absolutePath() + "/data/" + extender->name() + "/plugins");
+ QDir pluginsDir(game->gameDirectory().absolutePath() + "/data/" + extender->PluginPath());
#pragma message("implement this for usvfs")
@@ -194,7 +194,7 @@ void LoadMechanism::activateScriptExtender() throw MyException(QObject::tr("game doesn't support a script extender"));
}
- QDir pluginsDir(game->gameDirectory().absolutePath() + "/data/" + extender->name() + "/plugins");
+ QDir pluginsDir(game->gameDirectory().absolutePath() + "/data/" + extender->PluginPath());
if (!pluginsDir.exists()) {
pluginsDir.mkpath(".");
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 158e32d1..ace7dbd8 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1944,9 +1944,10 @@ void MainWindow::fileMoved(const QString &filePath, const QString &oldOriginName QString fullNewPath = ToQString(newOrigin.getPath()) + "\\" + filePath;
WIN32_FIND_DATAW findData;
- ::FindFirstFileW(ToWString(fullNewPath).c_str(), &findData);
-
+ HANDLE hFind;
+ hFind = ::FindFirstFileW(ToWString(fullNewPath).c_str(), &findData);
filePtr->addOrigin(newOrigin.getID(), findData.ftCreationTime, L"");
+ FindClose(hFind);
}
if (m_OrganizerCore.directoryStructure()->originExists(ToWString(oldOriginName))) {
FilesOrigin &oldOrigin = m_OrganizerCore.directoryStructure()->getOriginByName(ToWString(oldOriginName));
diff --git a/src/modinforegular.cpp b/src/modinforegular.cpp index bacc21f7..1194f604 100644 --- a/src/modinforegular.cpp +++ b/src/modinforegular.cpp @@ -442,7 +442,7 @@ std::vector<ModInfo::EContent> ModInfoRegular::getContents() const ->feature<ScriptExtender>(); if (extender != nullptr) { - QString sePluginPath = extender->name() + "/plugins"; + QString sePluginPath = extender->PluginPath(); if (dir.exists(sePluginPath)) m_CachedContent.push_back(CONTENT_SKSE); } diff --git a/src/organizercore.cpp b/src/organizercore.cpp index 9ae8beae..4857590d 100644 --- a/src/organizercore.cpp +++ b/src/organizercore.cpp @@ -1254,7 +1254,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)) {
|