summaryrefslogtreecommitdiff
path: root/src/organizercore.cpp
diff options
context:
space:
mode:
authorisanae <14251494+isanae@users.noreply.github.com>2019-09-12 01:48:48 -0400
committerisanae <14251494+isanae@users.noreply.github.com>2019-09-12 01:48:48 -0400
commitbf3d7527801bcba16ba01735efd3d5acc052f485 (patch)
tree5adc05d1ec725c7fbc948a4dfb2d0142f9ec9d35 /src/organizercore.cpp
parent971cecf343777894cec5144da11d16ef97d0db31 (diff)
made SpawnParameters public, changed to Qt types
removed 'suspended', not used
Diffstat (limited to 'src/organizercore.cpp')
-rw-r--r--src/organizercore.cpp24
1 files changed, 17 insertions, 7 deletions
diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index 9403b47d..dd4edbce 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -1282,6 +1282,13 @@ HANDLE OrganizerCore::spawnBinaryProcess(const QFileInfo &binary,
const QString &customOverwrite,
const QList<MOBase::ExecutableForcedLoadSetting> &forcedLibraries)
{
+ spawn::SpawnParameters sp;
+ sp.binary = binary;
+ sp.arguments = arguments;
+ sp.currentDirectory = currentDirectory;
+ sp.hooked = true;
+
+
prepareStart();
QWidget *window = qApp->activeWindow();
@@ -1290,11 +1297,11 @@ HANDLE OrganizerCore::spawnBinaryProcess(const QFileInfo &binary,
}
- if (!spawn::checkBinary(binary)) {
+ if (!spawn::checkBinary(window, sp)) {
return INVALID_HANDLE_VALUE;
}
- if (!spawn::checkSteam(window, managedGame()->gameDirectory(), binary, steamAppID, m_Settings)) {
+ if (!spawn::checkSteam(window, sp, managedGame()->gameDirectory(), steamAppID, m_Settings)) {
return INVALID_HANDLE_VALUE;
}
@@ -1322,11 +1329,11 @@ HANDLE OrganizerCore::spawnBinaryProcess(const QFileInfo &binary,
return INVALID_HANDLE_VALUE;
}
- if (!spawn::checkEnvironment(window, binary)) {
+ if (!spawn::checkEnvironment(window, sp)) {
return INVALID_HANDLE_VALUE;
}
- if (!spawn::checkBlacklist(window, m_Settings, binary)) {
+ if (!spawn::checkBlacklist(window, sp, m_Settings)) {
return INVALID_HANDLE_VALUE;
}
@@ -1364,11 +1371,14 @@ HANDLE OrganizerCore::spawnBinaryProcess(const QFileInfo &binary,
log::debug("Spawning proxyed process <{}>", cmdline);
- return spawn::startBinary(QFileInfo(QCoreApplication::applicationFilePath()),
- cmdline, QCoreApplication::applicationDirPath(), true);
+ sp.binary = QFileInfo(QCoreApplication::applicationFilePath());
+ sp.arguments = cmdline;
+ sp.currentDirectory.setPath(QCoreApplication::applicationDirPath());
+
+ return spawn::startBinary(window, sp);
} else {
log::debug("Spawning direct process <{}, {}, {}>", binPath, arguments, cwdPath);
- return spawn::startBinary(binary, arguments, currentDirectory, true);
+ return spawn::startBinary(window, sp);
}
} else {
log::debug("start of \"{}\" canceled by plugin", binary.absoluteFilePath());