diff options
| author | Weblate <noreply@weblate.org> | 2018-03-10 15:09:31 +0000 |
|---|---|---|
| committer | Weblate <noreply@weblate.org> | 2018-03-10 15:09:31 +0000 |
| commit | e823783499a7b2f8c3cbfb24ae428b39311bee5e (patch) | |
| tree | 74138f1e34b8f090f62bd5412f38b8e185209302 /src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp | |
| parent | Translated using Weblate (Italian) (diff) | |
| parent | Add the beginnings of the new window frame (widgets-based) (diff) | |
| download | lumina-e823783499a7b2f8c3cbfb24ae428b39311bee5e.tar.gz lumina-e823783499a7b2f8c3cbfb24ae428b39311bee5e.tar.bz2 lumina-e823783499a7b2f8c3cbfb24ae428b39311bee5e.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp')
| -rw-r--r-- | src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp b/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp index 5a08b797..82ce8a33 100644 --- a/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp +++ b/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp @@ -39,11 +39,17 @@ BrowserWidget::BrowserWidget(QString objID, QWidget *parent) : QWidget(parent){ } BrowserWidget::~BrowserWidget(){ + if(bThread->isRunning()){ bThread->exit(); } BROWSER->deleteLater(); - bThread->exit(); bThread->deleteLater(); } +void BrowserWidget::stop(){ + bThread->exit(); + this->setVisible(false); + this->disconnect(); +} + void BrowserWidget::changeDirectory(QString dir){ if(USE_VIDEO_LABEL){ QStringList vids = videoMap.keys(); @@ -305,8 +311,10 @@ void BrowserWidget::itemRemoved(QString item){ } void BrowserWidget::itemDataAvailable(QIcon ico, LFileInfo *info){ + if(info==0){ return; } if(listWidget!=0){ listWidget->setWhatsThis( BROWSER->currentDirectory() ); } if(treeWidget!=0){ treeWidget->setWhatsThis(BROWSER->currentDirectory() ); } + if(info->absolutePath() != BROWSER->currentDirectory()){ return; } //leftover item from a previous load //qDebug() << "Item Data Available:" << info->fileName(); int num = 0; if(listWidget!=0){ |