OpenToonz - An open-source full-featured 2D animation creation software
C
SceneViewer: Initialize m_keyAction with nullptr
Abel Youd511f25c6a87
diff --git a/toonz/sources/toonz/sceneviewer.h b/toonz/sources/toonz/sceneviewer.hindex 7a8751153..45aa7a91e 100644--- a/toonz/sources/toonz/sceneviewer.h+++ b/toonz/sources/toonz/sceneviewer.h@@ -62,8 +62,7 @@ public:// SceneViewer//------------------------------------------------------------------------------class SceneViewer final : public TToolViewer,- public Previewer::Listener {+class SceneViewer final : public TToolViewer, public Previewer::Listener {Q_OBJECTdouble m_pressure;@@ -96,8 +95,8 @@ class SceneViewer final : public TToolViewer,TPointD m_oldPos;bool m_dragging;- int m_mouseScrubbing = 0;- QAction *m_keyAction;+ int m_mouseScrubbing = 0;+ QAction *m_keyAction = nullptr;QPointF m_firstPanPoint;QPointF m_undoPoint;@@ -220,7 +219,7 @@ public:void onRenderStarted(int frame) override;void onRenderCompleted(int frame) override;void onPreviewUpdate() override;-+bool isPreviewEnabled() const { return m_previewMode != NO_PREVIEW; }int getPreviewMode() const { return m_previewMode; }diff --git a/toonz/sources/toonz/sceneviewerevents.cpp b/toonz/sources/toonz/sceneviewerevents.cppindex 10e68a4de..5cbafbda2 100644--- a/toonz/sources/toonz/sceneviewerevents.cpp+++ b/toonz/sources/toonz/sceneviewerevents.cpp@@ -1366,7 +1366,7 @@ bool SceneViewer::event(QEvent *e) {} else {m_mouseScrubbing = 0;m_keyAction->setEnabled(true);- m_keyAction = 0;+ m_keyAction = nullptr;invalidateToolStatus();e->accept();return true;