From: werner s. <wsc...@us...> - 2004-05-31 15:57:55
|
Update of /cvsroot/lmuse/muse/muse/midiedit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29583/muse/midiedit Modified Files: pianoroll.cpp Log Message: fixed another crash Index: pianoroll.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/midiedit/pianoroll.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** pianoroll.cpp 31 May 2004 13:59:09 -0000 1.23 --- pianoroll.cpp 31 May 2004 15:57:45 -0000 1.24 *************** *** 733,737 **** void PianoRoll::keyPressEvent(QKeyEvent* event) { - if (info->hasFocus()) { event->ignore(); --- 733,736 ---- *************** *** 739,751 **** } ! int index = 0; ! int n = sizeof(rasterTable); ! for (; index < n; ++index) if (rasterTable[index] == raster()) break; int off = (index / 9) * 9; index = index % 9; ! int val; PianoCanvas* pc = (PianoCanvas*)canvas; --- 738,754 ---- } ! int index; ! int n = sizeof(rasterTable)/sizeof(*rasterTable); ! for (index = 0; index < n; ++index) if (rasterTable[index] == raster()) break; + if (index == n) { + index = 0; + // raster 1 is not in table + } int off = (index / 9) * 9; index = index % 9; ! int val = 0; PianoCanvas* pc = (PianoCanvas*)canvas; *************** *** 779,785 **** return; } - - - else if (key == shortcuts[SHRT_POS_INC].key) { pc->pianoCmd(CMD_RIGHT); --- 782,785 ---- *************** *** 973,977 **** menuFunctions->setAccel(shortcuts[SHRT_CREATE_MEASURE].key, PianoCanvas::CMD_CREATE_MEASURE); menuFunctions->setAccel(shortcuts[SHRT_CONFIG_QUANT].key, menu_ids[CMD_CONFIG_QUANT]); - - } --- 973,975 ---- |