From 1f4a70bdba9ea6bb5814ab922ebcf50b6dd50120 Mon Sep 17 00:00:00 2001
From: shun_iwasawa <shun_iwasawa@c.dwango.co.jp>
Date: Tue, 28 Feb 2017 13:56:07 +0900
Subject: [PATCH] fix flipconsole connection

---
 toonz/sources/include/toonzqt/flipconsole.h |  2 +-
 toonz/sources/toonz/comboviewerpane.cpp     |  6 +-----
 toonz/sources/toonz/flipbook.cpp            | 10 +++++++---
 toonz/sources/toonz/viewerpane.cpp          |  7 +------
 toonz/sources/toonzqt/flipconsole.cpp       |  7 ++++++-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/toonz/sources/include/toonzqt/flipconsole.h b/toonz/sources/include/toonzqt/flipconsole.h
index 93e493fb..cf9e4129 100644
--- a/toonz/sources/include/toonzqt/flipconsole.h
+++ b/toonz/sources/include/toonzqt/flipconsole.h
@@ -393,7 +393,7 @@ protected slots:
   void onFPSEdited();
 
 public slots:
-  void onPreferenceChanged();
+  void onPreferenceChanged(const QString &);
 
 private:
   friend class PlaybackExecutor;
diff --git a/toonz/sources/toonz/comboviewerpane.cpp b/toonz/sources/toonz/comboviewerpane.cpp
index c5920056..af1fc706 100644
--- a/toonz/sources/toonz/comboviewerpane.cpp
+++ b/toonz/sources/toonz/comboviewerpane.cpp
@@ -786,10 +786,6 @@ bool ComboViewerPanel::isFrameAlreadyCached(int frame) {
 //-----------------------------------------------------------------------------
 
 void ComboViewerPanel::onPreferenceChanged(const QString &prefName) {
-  // if no name specified (on showEvent), then process all updates
-  if (prefName == "BlankCount" || prefName == "BlankColor" ||
-      prefName.isEmpty())
-    m_flipConsole->onPreferenceChanged();
-
+  m_flipConsole->onPreferenceChanged(prefName);
   StyleShortcutSwitchablePanel::onPreferenceChanged(prefName);
 }
diff --git a/toonz/sources/toonz/flipbook.cpp b/toonz/sources/toonz/flipbook.cpp
index b8cc24ed..74f0c01c 100644
--- a/toonz/sources/toonz/flipbook.cpp
+++ b/toonz/sources/toonz/flipbook.cpp
@@ -1872,9 +1872,9 @@ void FlipBook::showEvent(QShowEvent *e) {
   connect(sceneHandle, SIGNAL(sceneChanged()), m_imageViewer, SLOT(update()));
   // for updating the blank frame button
   if (!m_imageViewer->isColorModel()) {
-    connect(sceneHandle, SIGNAL(preferenceChanged()), m_flipConsole,
-            SLOT(onPreferenceChanged()));
-    m_flipConsole->onPreferenceChanged();
+    connect(sceneHandle, SIGNAL(preferenceChanged(const QString &)),
+            m_flipConsole, SLOT(onPreferenceChanged(const QString &)));
+    m_flipConsole->onPreferenceChanged("");
   }
   m_flipConsole->setActive(true);
   m_imageViewer->update();
@@ -1886,6 +1886,10 @@ void FlipBook::hideEvent(QHideEvent *e) {
   TSceneHandle *sceneHandle = TApp::instance()->getCurrentScene();
   disconnect(sceneHandle, SIGNAL(sceneChanged()), m_imageViewer,
              SLOT(update()));
+  if (!m_imageViewer->isColorModel()) {
+    disconnect(sceneHandle, SIGNAL(preferenceChanged(const QString &)),
+               m_flipConsole, SLOT(onPreferenceChanged(const QString &)));
+  }
   m_flipConsole->setActive(false);
 }
 
diff --git a/toonz/sources/toonz/viewerpane.cpp b/toonz/sources/toonz/viewerpane.cpp
index 6fc4ef75..5c799519 100644
--- a/toonz/sources/toonz/viewerpane.cpp
+++ b/toonz/sources/toonz/viewerpane.cpp
@@ -657,12 +657,7 @@ void SceneViewerPanel::onFrameTypeChanged() {
 //-----------------------------------------------------------------------------
 
 void SceneViewerPanel::onPreferenceChanged(const QString &prefName) {
-  // if no name specified (on StyleShortcutSelectivePanel::showEvent),
-  // then process all updates
-  if (prefName == "BlankCount" || prefName == "BlankColor" ||
-      prefName.isEmpty())
-    m_flipConsole->onPreferenceChanged();
-
+  m_flipConsole->onPreferenceChanged(prefName);
   StyleShortcutSwitchablePanel::onPreferenceChanged(prefName);
 }
 
diff --git a/toonz/sources/toonzqt/flipconsole.cpp b/toonz/sources/toonzqt/flipconsole.cpp
index 1caa5ac0..d86ea0f2 100644
--- a/toonz/sources/toonzqt/flipconsole.cpp
+++ b/toonz/sources/toonzqt/flipconsole.cpp
@@ -1847,7 +1847,12 @@ const std::vector<UCHAR> *FlipConsole::getProgressBarStatus() const {
 
 //--------------------------------------------------------------------
 
-void FlipConsole::onPreferenceChanged() {
+void FlipConsole::onPreferenceChanged(const QString &prefName) {
+  // react only when related properties are changed
+  if (prefName != "BlankCount" && prefName != "BlankColor" &&
+      !prefName.isEmpty())
+    return;
+
   if (m_drawBlanksEnabled) {
     Preferences::instance()->getBlankValues(m_blanksCount, m_blankColor);
     if (m_blanksCount == 0) {