From kde-commits Sat Jul 31 21:34:31 2010 From: Ralf Habacker Date: Sat, 31 Jul 2010 21:34:31 +0000 To: kde-commits Subject: kdesupport/kdewin-installer/shared Message-Id: <20100731213431.41B03AC783 () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=128061203409895 SVN commit 1157694 by habacker: limited sending of unpackager error only when really unpacking M +4 -2 installer.cpp --- trunk/kdesupport/kdewin-installer/shared/installer.cpp #1157693:1157694 @@ -49,7 +49,6 @@ : QObject(parent), m_type(Installer::Standard) { m_root = "."; - connect(Unpacker::instance(),SIGNAL(error(const QString &)),this,SLOT(slotError(const QString &))); } Installer::~Installer() @@ -175,7 +174,10 @@ m_files = QStringList() << pkg->localFilePath(type); } else { - if (!Unpacker::instance()->unpackFile(pkg->localFilePath(type), m_root, pkg->pathRelocations())) + connect(Unpacker::instance(),SIGNAL(error(const QString &)),this,SLOT(slotError(const QString &))); + bool ret = Unpacker::instance()->unpackFile(pkg->localFilePath(type), m_root, pkg->pathRelocations()); + disconnect(Unpacker::instance(),SIGNAL(error(const QString &)),this,SLOT(slotError(const QString &))); + if (!ret) return false; m_files = Unpacker::instance()->unpackedFiles(); }