Navigation Menu

Skip to content

Commit

Permalink
Fix tasks don't show in status bar if they start before the widget is…
Browse files Browse the repository at this point in the history
… created

(cherry picked from commit 839a1b8)
  • Loading branch information
nyalldawson authored and nirvn committed Apr 20, 2020
1 parent ccca075 commit a617630
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/core/qgsnetworkcontentfetchertask.cpp
Expand Up @@ -19,12 +19,12 @@
#include "qgsnetworkcontentfetchertask.h"
#include "qgsnetworkcontentfetcher.h"

QgsNetworkContentFetcherTask::QgsNetworkContentFetcherTask( const QUrl &url, const QString &authcfg, Flags flags )
QgsNetworkContentFetcherTask::QgsNetworkContentFetcherTask( const QUrl &url, const QString &authcfg, QgsTask::Flags flags )
: QgsNetworkContentFetcherTask( QNetworkRequest( url ), authcfg, flags )
{
}

QgsNetworkContentFetcherTask::QgsNetworkContentFetcherTask( const QNetworkRequest &request, const QString &authcfg, Flags flags )
QgsNetworkContentFetcherTask::QgsNetworkContentFetcherTask( const QNetworkRequest &request, const QString &authcfg, QgsTask::Flags flags )
: QgsTask( tr( "Fetching %1" ).arg( request.url().toString() ), flags )
, mRequest( request )
, mAuthcfg( authcfg )
Expand Down
3 changes: 3 additions & 0 deletions src/gui/qgstaskmanagerwidget.cpp
Expand Up @@ -621,6 +621,9 @@ QgsTaskManagerStatusBarWidget::QgsTaskManagerStatusBarWidget( QgsTaskManager *ma
connect( manager, &QgsTaskManager::allTasksFinished, this, &QgsTaskManagerStatusBarWidget::allFinished );
connect( manager, &QgsTaskManager::finalTaskProgressChanged, this, &QgsTaskManagerStatusBarWidget::overallProgressChanged );
connect( manager, &QgsTaskManager::countActiveTasksChanged, this, &QgsTaskManagerStatusBarWidget::countActiveTasksChanged );

if ( manager->countActiveTasks() )
showButton();
}

QSize QgsTaskManagerStatusBarWidget::sizeHint() const
Expand Down

0 comments on commit a617630

Please sign in to comment.