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

@@ -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>
 

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

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.