From 3eb85cd17fc629475afb256d78e2444cf054e2ef Mon Sep 17 00:00:00 2001 From: LostDragonist Date: Sun, 24 Mar 2019 21:28:13 -0500 Subject: [PATCH] Update for startApplication --- src/runner/pythonrunner.cpp | 2 +- src/runner/uibasewrappers.h | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/runner/pythonrunner.cpp b/src/runner/pythonrunner.cpp index 53b1ed1..c1e00d0 100644 --- a/src/runner/pythonrunner.cpp +++ b/src/runner/pythonrunner.cpp @@ -982,7 +982,7 @@ BOOST_PYTHON_MODULE(mobase) .def("pluginList", bpy::pure_virtual(&IOrganizer::pluginList), bpy::return_value_policy()) .def("modList", bpy::pure_virtual(&IOrganizer::modList), bpy::return_value_policy()) .def("profile", bpy::pure_virtual(&IOrganizer::profile), bpy::return_value_policy()) - .def("startApplication", bpy::pure_virtual(&IOrganizer::startApplication), ((bpy::arg("args")=QStringList()), (bpy::arg("cwd")=""), (bpy::arg("profile")="")), bpy::return_value_policy()) + .def("startApplication", bpy::pure_virtual(&IOrganizer::startApplication), ((bpy::arg("args")=QStringList()), (bpy::arg("cwd")=""), (bpy::arg("profile")=""), (bpy::arg("forcedCustomOverwrite")=""), (bpy::arg("ignoreCustomOverwrite")=false)), bpy::return_value_policy()) //.def("waitForApplication", bpy::pure_virtual(&IOrganizer::waitForApplication), (bpy::arg("exitCode")=nullptr), bpy::return_value_policy()) // Use wrapped version .def("waitForApplication", waitForApplication) diff --git a/src/runner/uibasewrappers.h b/src/runner/uibasewrappers.h index 6978283..b31bb60 100644 --- a/src/runner/uibasewrappers.h +++ b/src/runner/uibasewrappers.h @@ -356,9 +356,11 @@ struct IOrganizerWrapper : MOBase::IOrganizer, virtual HANDLE startApplication(const QString &executable, const QStringList &args = QStringList(), const QString &cwd = "", - const QString &profile = "") override + const QString &profile = "", + const QString &forcedCustomOverwrite = "", + bool ignoreCustomOverwrite = false) override { - return reinterpret_cast(this->get_override("startApplication")(executable, args, cwd, profile).as()); + return reinterpret_cast(this->get_override("startApplication")(executable, args, cwd, profile, forcedCustomOverwrite, ignoreCustomOverwrite).as()); } virtual bool waitForApplication(HANDLE handle, LPDWORD exitCode = nullptr) const override