From 84f3ecf76ba2ec26d2b2fc0a601abcefc50bb8f2 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Thu, 12 Feb 2009 22:53:07 +0000 Subject: [PATCH] ensure, cursor is never NULL when painting it in paintEvent() git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/branches/lmms/stable-0.4@2021 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 3 +++ src/gui/piano_roll.cpp | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4c019bf7d..8c213e0e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2009-02-12 Tobias Doerffel + * src/gui/piano_roll.cpp: + ensure, cursor is never NULL when painting it in paintEvent() + * src/core/sample_buffer.cpp: do not load samples bigger than 100 MB (closes #2458375) diff --git a/src/gui/piano_roll.cpp b/src/gui/piano_roll.cpp index c86ad6586..212b83ddc 100644 --- a/src/gui/piano_roll.cpp +++ b/src/gui/piano_roll.cpp @@ -2,7 +2,7 @@ * piano_roll.cpp - implementation of piano-roll which is used for actual * writing of melodies * - * Copyright (c) 2004-2008 Tobias Doerffel + * Copyright (c) 2004-2009 Tobias Doerffel * Copyright (c) 2008 Andrew Kelley * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net @@ -2864,11 +2864,13 @@ void pianoRoll::paintEvent( QPaintEvent * _pe ) break; case ModeErase: cursor = s_toolErase; break; case ModeSelect: cursor = s_toolSelect; break; - //case ModeMove: cursor = s_toolMove; break; case ModeOpen: cursor = s_toolOpen; break; } - p.drawPixmap( mapFromGlobal( QCursor::pos() ) + QPoint( 8, 8 ), + if( cursor != NULL ) + { + p.drawPixmap( mapFromGlobal( QCursor::pos() ) + QPoint( 8, 8 ), *cursor ); + } }