diff --git a/applets/comic/comic.cpp b/applets/comic/comic.cpp --- a/applets/comic/comic.cpp +++ b/applets/comic/comic.cpp @@ -83,7 +83,7 @@ configChanged(); - mEngine = Plasma::PluginLoader::self()->loadDataEngine(QStringLiteral("comic")); + mEngine = dataEngine(QStringLiteral("comic")); mModel = new ComicModel(mEngine, QStringLiteral("providers"), mTabIdentifier, this); mProxy = new QSortFilterProxyModel( this ); mProxy->setSourceModel( mModel ); @@ -163,12 +163,6 @@ ComicApplet::~ComicApplet() { - if (mEngine && mEngine->isValid()) { - auto sources = mEngine->sources(); - Q_FOREACH(auto source, sources) { - mEngine->disconnectSource(source, this); - } - } delete mSavingDir; delete m_newStuffDialog; } diff --git a/dataengines/comic/comicproviderwrapper.cpp b/dataengines/comic/comicproviderwrapper.cpp --- a/dataengines/comic/comicproviderwrapper.cpp +++ b/dataengines/comic/comicproviderwrapper.cpp @@ -719,9 +719,6 @@ mKrossImage = new ImageWrapper(this, data); callFunction(QLatin1String("pageRetrieved"), QVariantList() << id << qVariantFromValue(qobject_cast(mKrossImage))); - if (mRequests < 1) { // Don't finish if we still have pageRequests - finished(); - } } else { QTextCodec *codec = nullptr; if (!mTextCodec.isEmpty()) { @@ -734,6 +731,10 @@ callFunction(QLatin1String("pageRetrieved"), QVariantList() << id << html); } + if (mRequests < 1) { // Don't finish if we still have pageRequests + finished(); + } + qWarning() << __PRETTY_FUNCTION__ << id << mRequests << this; } void ComicProviderWrapper::pageError(int id, const QString &message) @@ -743,6 +744,7 @@ if (!functionCalled()) { emit mProvider->error(mProvider); } + qWarning() << __PRETTY_FUNCTION__ << id << mRequests << this; } void ComicProviderWrapper::redirected(int id, const QUrl &newUrl) @@ -752,6 +754,7 @@ if (mRequests < 1) { //Don't finish while there are still requests finished(); } + qWarning() << __PRETTY_FUNCTION__ << id << mRequests << this; } void ComicProviderWrapper::finished() const @@ -783,6 +786,7 @@ } mProvider->requestPage(QUrl(url), id, map); ++mRequests; + qWarning() << __PRETTY_FUNCTION__ << url << id << mRequests << this; } void ComicProviderWrapper::requestRedirectedUrl(const QString &url, int id, const QVariantMap &infos) @@ -794,6 +798,7 @@ } mProvider->requestRedirectedUrl(QUrl(url), id, map); ++mRequests; + qWarning() << __PRETTY_FUNCTION__ << url << id << mRequests << this; }