Fix show/hide of in/out points in monitor overlay

svn path=/trunk/kdenlive/; revision=3154

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 93f842f8dc014a776cf169022a2b744055f136b7..5ba70773ac31c50c7e40f867ae3dcff3b8d303c0 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -167,9 +167,10 @@ void Monitor::setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMe
         m_configMenu->addAction(setThumbFrame);
     }
 
         m_configMenu->addAction(setThumbFrame);
     }
 

-    QAction *showTips = m_contextMenu->addAction(KIcon("help-hint"), i18n("Monitor overlay infos"), this, SLOT(slotSwitchMonitorInfo(bool)));
+    QAction *showTips = m_contextMenu->addAction(KIcon("help-hint"), i18n("Monitor overlay infos"));

     showTips->setCheckable(true);
     showTips->setCheckable(true);

-    slotSwitchMonitorInfo(KdenliveSettings::displayMonitorInfo());
+    connect(showTips, SIGNAL(toggled(bool)), this, SLOT(slotSwitchMonitorInfo(bool)));
+    showTips->setChecked(KdenliveSettings::displayMonitorInfo());

     m_configMenu->addAction(showTips);
 
 }
     m_configMenu->addAction(showTips);
 
 }


@@ -676,7 +677,7 @@ void Monitor::slotSwitchMonitorInfo(bool show) {
         m_overlay = new Overlay(m_monitorRefresh);
         m_overlay->raise();
         m_overlay->setHidden(true);
         m_overlay = new Overlay(m_monitorRefresh);
         m_overlay->raise();
         m_overlay->setHidden(true);

-    } else {
+    } else if (m_overlay) {

         delete m_overlay;
         m_overlay = NULL;
     }
         delete m_overlay;
         m_overlay = NULL;
     }