diff --git a/src/proxy/proxypython.cpp b/src/proxy/proxypython.cpp index 121446f..08d7c5b 100644 --- a/src/proxy/proxypython.cpp +++ b/src/proxy/proxypython.cpp @@ -178,7 +178,7 @@ QString ProxyPython::description() const VersionInfo ProxyPython::version() const { - return VersionInfo(1, 2, 0, VersionInfo::RELEASE_FINAL); + return VersionInfo(1, 2, 1, VersionInfo::RELEASE_FINAL); } bool ProxyPython::isActive() const diff --git a/src/runner/pythonrunner.cpp b/src/runner/pythonrunner.cpp index 18a2e13..6dc90f2 100644 --- a/src/runner/pythonrunner.cpp +++ b/src/runner/pythonrunner.cpp @@ -46,8 +46,9 @@ private: }; -IPythonRunner *CreatePythonRunner(const MOBase::IOrganizer *moInfo, const QString &pythonDir) +IPythonRunner *CreatePythonRunner(MOBase::IOrganizer *moInfo, const QString &pythonDir) { + s_Organizer = moInfo; PythonRunner *result = new PythonRunner(moInfo); if (result->initPython(pythonDir)) { return result; diff --git a/src/runner/pythonrunner.h b/src/runner/pythonrunner.h index f5cf752..4ef771a 100644 --- a/src/runner/pythonrunner.h +++ b/src/runner/pythonrunner.h @@ -22,7 +22,7 @@ public: #define PYDLLEXPORT Q_DECL_IMPORT #endif // PYTHONRUNNER_LIBRARY -extern "C" PYDLLEXPORT IPythonRunner *CreatePythonRunner(const MOBase::IOrganizer *moInfo, const QString &pythonDir); +extern "C" PYDLLEXPORT IPythonRunner *CreatePythonRunner(MOBase::IOrganizer *moInfo, const QString &pythonDir); diff --git a/src/runner/uibasewrappers.h b/src/runner/uibasewrappers.h index 1d7d6b5..882272e 100644 --- a/src/runner/uibasewrappers.h +++ b/src/runner/uibasewrappers.h @@ -65,8 +65,8 @@ public: void onRequestFailed(boost::python::object callback) { m_FailedHandler = callback; - connect(m_Wrapped, SIGNAL(requestFailed(int,QVariant,QString)), - this, SLOT(requestFailed(int,QVariant,QString)), + connect(m_Wrapped, SIGNAL(requestFailed(int,int,QVariant,QString)), + this, SLOT(requestFailed(int,int,QVariant,QString)), Qt::UniqueConnection); } @@ -91,11 +91,11 @@ private slots: // } } - void requestFailed(int modID, QVariant userData, const QString &errorMessage) + void requestFailed(int modID, int fileID, QVariant userData, const QString &errorMessage) { try { GILock lock; - m_FailedHandler(modID, userData, errorMessage); + m_FailedHandler(modID, fileID, userData, errorMessage); } catch (const boost::python::error_already_set&) { reportPythonError(); }