Merge pull request #695 from ModOrganizer2/Develop

Stage for Release 2.2.0

1 files changed, 8 insertions, 5 deletions

diff --git a/src/organizerproxy.cpp b/src/organizerproxy.cpp
index 8e0bc95b..d6996b3a 100644
--- a/src/organizerproxy.cpp
+++ b/src/organizerproxy.cpp
@@ -39,9 +39,6 @@ QString OrganizerProxy::downloadsPath() const
 

 QString OrganizerProxy::overwritePath() const

 {

-  /*return QDir::fromNativeSeparators(qApp->property("dataPath").toString())

-         + "/"

-	 + ToQString(AppConfig::overwritePath());*/

   return m_Proxied->overwritePath();

 }

 

@@ -50,6 +47,11 @@ QString OrganizerProxy::basePath() const
   return m_Proxied->basePath();

 }

 

+QString OrganizerProxy::modsPath() const

+{

+  return m_Proxied->modsPath();

+}

+

 VersionInfo OrganizerProxy::appVersion() const

 {

   return m_Proxied->appVersion();

@@ -105,9 +107,10 @@ QString OrganizerProxy::pluginDataPath() const
   return m_Proxied->pluginDataPath();

 }

 

-HANDLE OrganizerProxy::startApplication(const QString &executable, const QStringList &args, const QString &cwd, const QString &profile)

+HANDLE OrganizerProxy::startApplication(const QString &executable, const QStringList &args, const QString &cwd,

+                                        const QString &profile, const QString &forcedCustomOverwrite, bool ignoreCustomOverwrite)

 {

-  return m_Proxied->startApplication(executable, args, cwd, profile);

+  return m_Proxied->startApplication(executable, args, cwd, profile, forcedCustomOverwrite, ignoreCustomOverwrite);

 }

 

 bool OrganizerProxy::waitForApplication(HANDLE handle, LPDWORD exitCode) const