summaryrefslogtreecommitdiff
path: root/src/processrunner.h
diff options
context:
space:
mode:
authorisanae <14251494+isanae@users.noreply.github.com>2019-12-08 11:33:03 -0500
committerisanae <14251494+isanae@users.noreply.github.com>2019-12-08 11:33:03 -0500
commitc9049bb07274aaefa79c9751ec40910bf8daf0ca (patch)
tree48aada30a7c0ee4111422a9cfc84275a8f2bbf8d /src/processrunner.h
parent2c59d13be645bb8c12adae883938c9a8652f3dee (diff)
conflicts tab: run exes unhooked by default
Diffstat (limited to 'src/processrunner.h')
-rw-r--r--src/processrunner.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/processrunner.h b/src/processrunner.h
index d576216a..1bfdc465 100644
--- a/src/processrunner.h
+++ b/src/processrunner.h
@@ -67,6 +67,7 @@ public:
ProcessRunner& setProfileName(const QString& profileName);
ProcessRunner& setWaitForCompletion(
WaitFlags flags=NoFlags, UILocker::Reasons reason=UILocker::LockUI);
+ ProcessRunner& setHooked(bool b);
// - if the target is an executable file, runs it hooked
// - if the target is a file:
@@ -74,8 +75,7 @@ public:
// - if forceHook is true, gets the executable associated with the file
// and runs that hooked by passing the file as an argument
//
- ProcessRunner& setFromFile(
- QWidget* parent, const QFileInfo& targetInfo, bool forceHook = false);
+ ProcessRunner& setFromFile(QWidget* parent, const QFileInfo& targetInfo);
ProcessRunner& setFromExecutable(const Executable& exe);
ProcessRunner& setFromShortcut(const MOShortcut& shortcut);
@@ -150,11 +150,13 @@ private:
QString m_profileName;
UILocker::Reasons m_lockReason;
WaitFlags m_waitFlags;
- QString m_shellOpen;
+ QFileInfo m_shellOpen;
env::HandlePtr m_handle;
DWORD m_exitCode;
+ bool shouldRunShell() const;
+
// runs the command in m_shellOpen; returns empty if it can be waited for
//
std::optional<Results> runShell();