From 4bb03fa9aeec9522e6252be5ece2b6d45232bf13 Mon Sep 17 00:00:00 2001
From: "justforlxz.com" <justforlxz@gmail.com>
Date: Wed, 19 Jun 2019 16:38:48 +0800
Subject: [PATCH] fix(2d): Clicking on the preview will crash

---
 frame/item/components/floatingpreview.cpp  | 8 ++++++--
 frame/item/components/previewcontainer.cpp | 5 ++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/frame/item/components/floatingpreview.cpp b/frame/item/components/floatingpreview.cpp
index af10d9a6e..aa9d40759 100644
--- a/frame/item/components/floatingpreview.cpp
+++ b/frame/item/components/floatingpreview.cpp
@@ -126,7 +126,9 @@ void FloatingPreview::mouseReleaseEvent(QMouseEvent *e)
 {
     QWidget::mouseReleaseEvent(e);
 
-    emit m_tracked->clicked(m_tracked->wid());
+    if (m_tracked) {
+        emit m_tracked->clicked(m_tracked->wid());
+    }
 }
 
 bool FloatingPreview::eventFilter(QObject *watched, QEvent *event)
@@ -139,7 +141,9 @@ bool FloatingPreview::eventFilter(QObject *watched, QEvent *event)
 
 void FloatingPreview::hideEvent(QHideEvent *event)
 {
-    m_tracked->setContentsMargins(0, 0, 0, 0);
+    if (m_tracked) {
+        m_tracked->setContentsMargins(0, 0, 0, 0);
+    }
 
     QWidget::hideEvent(event);
 }
diff --git a/frame/item/components/previewcontainer.cpp b/frame/item/components/previewcontainer.cpp
index 316d03514..4d443391d 100644
--- a/frame/item/components/previewcontainer.cpp
+++ b/frame/item/components/previewcontainer.cpp
@@ -186,7 +186,10 @@ void PreviewContainer::enterEvent(QEvent *e)
 
     m_needActivate = false;
     m_mouseLeaveTimer->stop();
-    m_waitForShowPreviewTimer->start();
+
+    if (m_wmHelper->hasComposite()) {
+        m_waitForShowPreviewTimer->start();
+    }
 }
 
 void PreviewContainer::leaveEvent(QEvent *e)