Cleanup + when clicking in monitor, only start playing if monitor was already active:

http://kdenlive.org/mantis/view.php?id=1178

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

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 8ea76bc2bb2e8498217bf07776031c9877d994c6..1dbb0569a298e50ed27951a52411b5a401dab09e 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -1682,8 +1682,7 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut)
 
         m_document->renderer()->mltCutClip(m_document->tracksCount() - info.track, cutTime);
         int cutPos = (int) cutTime.frames(m_document->fps());
-        ItemInfo newPos = info;
-        double speed = item->speed();
+        ItemInfo newPos;
         newPos.startPos = cutTime;
         newPos.endPos = info.endPos;
         newPos.cropStart = item->info().cropStart + (cutTime - info.startPos);

diff --git a/src/monitor.cpp b/src/monitor.cpp
index cedfc4e4cda61af0bb1d31aa64e8c652110b9f65..aecfe116b02263972246574d53667ed7ffefd74d 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -388,7 +388,8 @@ void Monitor::mouseReleaseEvent(QMouseEvent * event)
 {
     if (m_dragStarted) {
         if (m_ui.video_frame->underMouse()) {
-            slotPlay();
+            if (isActive()) slotPlay();
+            else activateMonitor();
         } else QWidget::mouseReleaseEvent(event);
         m_dragStarted = false;
     }