[Kdenlive-svn] [kdenlive] src: Fix crash in title widget: http://kdenlive.org/mantis/view.php?id=3032

[Jean-Baptiste M. <jb...@kd...>]

Git commit a023a12f223c1f4c5bf44c6a6d2f6ce0b4e66b73 by Jean-Baptiste Mardelle.
Committed on 30/03/2013 at 21:02.
Pushed by mardelle into branch 'master'.

Fix crash in title widget: http://kdenlive.org/mantis/view.php?id=3032

M  +3    -2    src/graphicsscenerectmove.cpp
M  +3    -0    src/titlewidget.cpp

http://commits.kde.org/kdenlive/a023a12f223c1f4c5bf44c6a6d2f6ce0b4e66b73

diff --git a/src/graphicsscenerectmove.cpp b/src/graphicsscenerectmove.cpp
index da92872..5c76845 100644
--- a/src/graphicsscenerectmove.cpp
+++ b/src/graphicsscenerectmove.cpp
@@ -108,8 +108,9 @@ void GraphicsSceneRectMove::keyPressEvent(QKeyEvent * keyEvent)
     case Qt::Key_Delete:
     case Qt::Key_Backspace:
         foreach (QGraphicsItem *qgi, selectedItems()) {
-            removeItem(qgi);
-            delete qgi;
+	    if (qgi->data(-1).toInt() == -1) continue;
+	    removeItem(qgi);
+	    delete qgi;
         }
         m_selectedItem = NULL;
         emit selectionChanged();
diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp
index 609e8a9..ed72944 100644
--- a/src/titlewidget.cpp
+++ b/src/titlewidget.cpp
@@ -492,7 +492,10 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render
     kDebug() << "// TITLE WIDGWT: " << graphicsView->viewport()->width() << "x" << graphicsView->viewport()->height();
     //toolBox->setItemEnabled(2, false);
     m_startViewport = new QGraphicsRectItem(QRectF(0, 0, m_frameWidth, m_frameHeight));
+    // Setting data at -1 so that the item is recognized as undeletable by graphicsscenerectmove
+    m_startViewport->setData(-1, -1);
     m_endViewport = new QGraphicsRectItem(QRectF(0, 0, m_frameWidth, m_frameHeight));
+    m_endViewport->setData(-1, -1);
     m_startViewport->setData(0, m_frameWidth);
     m_startViewport->setData(1, m_frameHeight);
     m_endViewport->setData(0, m_frameWidth);