Merge with branch1.2

1 files changed, 10 insertions, 3 deletions

diff --git a/src/installationmanager.cpp b/src/installationmanager.cpp
index 880587b7..ebccd36d 100644
--- a/src/installationmanager.cpp
+++ b/src/installationmanager.cpp
@@ -68,9 +68,8 @@ template <typename T> T resolveFunction(QLibrary &lib, const char *name)
 }

 

 

-InstallationManager::InstallationManager(QWidget *parent)

-  : QObject(parent), m_ParentWidget(parent),

-    m_InstallationProgress(parent), m_SupportedExtensions(boost::assign::list_of("zip")("rar")("7z")("fomod")("001"))

+InstallationManager::InstallationManager()

+  : m_InstallationProgress(nullptr), m_SupportedExtensions(boost::assign::list_of("zip")("rar")("7z")("fomod")("001"))

 {

   QLibrary archiveLib("dlls\\archive.dll");

   if (!archiveLib.load()) {

@@ -93,6 +92,14 @@ InstallationManager::~InstallationManager()
   delete m_CurrentArchive;

 }

 

+void InstallationManager::setParentWidget(QWidget *widget)

+{

+  m_InstallationProgress.setParent(widget);

+  for (IPluginInstaller *installer : m_Installers) {

+    installer->setParentWidget(widget);

+  }

+}

+

 

 void InstallationManager::queryPassword(LPSTR password)

 {