aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/desktop-utils/lumina-fm/Browser.cpp
diff options
context:
space:
mode:
authorKen Moore <ken@ixsystems.com>2017-10-18 12:10:10 -0400
committerKen Moore <ken@ixsystems.com>2017-10-18 12:10:10 -0400
commite5f8846fd775269314e5be502261284b9183205e (patch)
treeb87c318f16124b4a56daec9cf77baa78727cecf4 /src-qt5/desktop-utils/lumina-fm/Browser.cpp
parentAnother quick checkpoint for Lumina 2 files. Nothing too spectacular yet - st... (diff)
downloadlumina-e5f8846fd775269314e5be502261284b9183205e.tar.gz
lumina-e5f8846fd775269314e5be502261284b9183205e.tar.bz2
lumina-e5f8846fd775269314e5be502261284b9183205e.zip
Make LVideoLabel thread-safe.
Couple quick fixes for the Browser class in lumina-fm too (minor cleanup).
Diffstat (limited to 'src-qt5/desktop-utils/lumina-fm/Browser.cpp')
-rw-r--r--src-qt5/desktop-utils/lumina-fm/Browser.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src-qt5/desktop-utils/lumina-fm/Browser.cpp b/src-qt5/desktop-utils/lumina-fm/Browser.cpp
index d829fff0..a68b8580 100644
--- a/src-qt5/desktop-utils/lumina-fm/Browser.cpp
+++ b/src-qt5/desktop-utils/lumina-fm/Browser.cpp
@@ -103,13 +103,13 @@ void Browser::futureFinished(QString name, QImage icon){
//Note: this will be called once for every item that loads
//Haven't added the extra files in a directory fix, but that should be easy to do
//Try to load a file with multiple videos and lots of other stuff before any other directory. It crashes for some reason
- qDebug() << name << "here";
+ //qDebug() << name << "here";
QIcon *ico = new QIcon();
LFileInfo *info = new LFileInfo(name);
if(!icon.isNull() && showThumbs){
QPixmap pix = QPixmap::fromImage(icon);
ico->addPixmap(pix);
- }else if(videoFormats.contains(name.section(".",-1).toLower())) {
+ }else if(info->isVideo() && showThumbs) {
if(videoImages.find(name) == videoImages.end()) {
LVideoLabel *mediaLabel = new LVideoLabel(name);
while(mediaLabel->pixmap()->isNull()) { QCoreApplication::processEvents(QEventLoop::AllEvents, 50); }
bgstack15