summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-04-28 11:56:06 -0500
committerSlávek Banko <slavek.banko@axis.cz>2012-06-23 15:43:46 +0200
commitc0c6d6299cc7e77a4b09c39210b09ebbd7bc3fd1 (patch)
tree39a52991f7d0a757c6360b54758415f316e9c215
parent466108ad3807e8fddf21b05fc41b0efc409f1566 (diff)
downloadk3b-c0c6d6299cc7e77a4b09c39210b09ebbd7bc3fd1.tar.gz
k3b-c0c6d6299cc7e77a4b09c39210b09ebbd7bc3fd1.zip
GCC 4.7 fixes.
Thanks to David C. Rankin. (cherry picked from commit 47da85fe986d13c15b94dd421018cd0c4570de94)
-rw-r--r--src/projects/k3baudioeditorwidget.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/projects/k3baudioeditorwidget.cpp b/src/projects/k3baudioeditorwidget.cpp
index ed17c01..690b544 100644
--- a/src/projects/k3baudioeditorwidget.cpp
+++ b/src/projects/k3baudioeditorwidget.cpp
@@ -663,15 +663,16 @@ void K3bAudioEditorWidget::mousePressEvent( TQMouseEvent* e )
{
m_draggedRange = 0;
m_draggedMarker = 0;
-
bool end;
- if( Range* r = findRangeEdge( e->pos(), &end ) ) {
+ Range* r = findRangeEdge( e->pos(), &end );
+
+ if (r) {
m_draggedRange = r;
m_draggingRangeEnd = end;
setSelectedRange( r );
}
else {
- Range* r = findRange( e->pos() );
+ r = findRange( e->pos() );
d->movedRange = r;
d->lastMovePosition = posToMsf( e->pos().x() );
setSelectedRange( r );