From b3ed6e7fe97062489f0681d87710cbf7be66d429 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Mon, 15 Dec 2008 22:07:27 +0000
Subject: [PATCH] if you pressed both controls at the same time, the piano roll
 would get stuck in selection mode (FIXED)

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1931 0778d3d1-df1d-0410-868b-ea421aaaa00d
---
 ChangeLog              |  6 ++++--
 TODO                   |  1 -
 src/gui/piano_roll.cpp | 13 ++++++++-----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9927e30db..ff889fba5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,8 +2,10 @@
 
 	* include/piano_roll.h:
 	* src/gui/piano_roll.cpp:
-	if you move a single note, it is deselected after the move to allow
-	note editing
+	- if you move a single note, it is deselected after the move to allow
+	  note editing
+	- if you pressed both controls at the same time, the piano roll would 
+	  get stuck in selection mode (FIXED)
 
 2008-12-14	Andrew Kelley	<superjoe30/at/gmail/dot/com>
 
diff --git a/TODO b/TODO
index 93481481d..40d1b1fda 100644
--- a/TODO
+++ b/TODO
@@ -52,7 +52,6 @@
 - add FLAC as export-format?
 
 Andrew Kelley's todo:
-- if you press both controls at the same time, the piano roll gets stuck in selection mode
 - multiview button - show notes from every instrument in the current beat+bassline with different colors
 - undo/redo for piano roll
 - add a tools menu to piano roll
diff --git a/src/gui/piano_roll.cpp b/src/gui/piano_roll.cpp
index 93fc92077..e298f8805 100644
--- a/src/gui/piano_roll.cpp
+++ b/src/gui/piano_roll.cpp
@@ -1126,11 +1126,14 @@ void pianoRoll::keyPressEvent( QKeyEvent * _ke )
 		}
 
 		case Qt::Key_Control:
-			m_ctrlMode = m_editMode;
-			m_editMode = ModeSelect;
-			QApplication::changeOverrideCursor(
-											   QCursor( Qt::ArrowCursor ) );
-			update();
+			if( m_editMode != ModeSelect )
+			{
+				m_ctrlMode = m_editMode;
+				m_editMode = ModeSelect;
+				QApplication::changeOverrideCursor(
+												   QCursor( Qt::ArrowCursor ) );
+				update();
+			}
 			break;
 		case Qt::Key_Shift:
 			/* TODO: implement note detuning some other way.