Merge pull request #1503 from badosu/master

Fix PianoRoll changing editMode outside window
2014-12-28 19:33:40 -05:00
parent b27a5f8d90 2e1bfb47a5
commit 23ec0e71c1
1 changed files with 7 additions and 4 deletions
--- a/src/gui/PianoRoll.cpp
+++ b/src/gui/PianoRoll.cpp
@@ -1462,10 +1462,13 @@ void PianoRoll::keyPressEvent( QKeyEvent* event )
 		}

 		case Qt::Key_Control:
-			m_ctrlMode = m_editMode;
-			m_editMode = ModeSelect;
-			QApplication::changeOverrideCursor( Qt::ArrowCursor );
-			event->accept();
+			if ( isActiveWindow() )
+			{
+				m_ctrlMode = m_editMode;
+				m_editMode = ModeSelect;
+				QApplication::changeOverrideCursor( Qt::ArrowCursor );
+				event->accept();
+			}
 			break;
 		default:
 			break;