nou/tenmon
1
0
Fork 1
Code Issues Pull Requests Projects Releases 33 Wiki Activity

Properly handle load when QPixmap is null

Browse Source
This commit is contained in:
Dušan Poizl
2021-04-14 10:28:38 +02:00
parent 05b40b64f8
commit 8aeafbdc5e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
imageringlist.cpp
+2 -2
View File
@@ -19,13 +19,13 @@ Image::Image(const QString name, ImageRingList *ringList) :
void Image::load() void Image::load()
{ {
if(m_pixmap.isNull() && !m_loading) if(m_pixmap.isNull() && !m_rawImage && !m_loading)
{ {
m_loading = true; m_loading = true;
m_released = false; m_released = false;
QThreadPool::globalInstance()->start(new LoadRunable(m_name, this, m_ringList->analyzeLevel())); QThreadPool::globalInstance()->start(new LoadRunable(m_name, this, m_ringList->analyzeLevel()));
} }
if(!m_loading && !m_pixmap.isNull()) if(!m_loading && (!m_pixmap.isNull() || m_rawImage))
emit pixmapLoaded(this); emit pixmapLoaded(this);
} }