aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@theqtcompany.com>2016-02-04 10:12:26 +0100
committerMitch Curtis <mitch.curtis@theqtcompany.com>2016-02-04 12:39:05 +0000
commitf5685e350017ff7c34d44e6b87d38c00439c0111 (patch)
treee30c9efdc7d458d4186c6e3532b7367dec80fb29 /src
parentcecf625f8267d2ed004f63da5b012ce76eb4fa40 (diff)
Fix negative emitRate causing app to hang
Change-Id: Ieb74ab1a1369ca8c70243002e6b6deec86c03dd6 Task-number: QTBUG-50250 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/particles/qquickparticleemitter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/particles/qquickparticleemitter.cpp b/src/particles/qquickparticleemitter.cpp
index e34356aa66..296f215174 100644
--- a/src/particles/qquickparticleemitter.cpp
+++ b/src/particles/qquickparticleemitter.cpp
@@ -337,7 +337,7 @@ void QQuickParticleEmitter::emitWindow(int timeStamp)
{
if (m_system == 0)
return;
- if ((!m_enabled || !m_particlesPerSecond)&& !m_pulseLeft && m_burstQueue.isEmpty()){
+ if ((!m_enabled || m_particlesPerSecond <= 0)&& !m_pulseLeft && m_burstQueue.isEmpty()){
m_reset_last = true;
return;
}