vino/rocket
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed a crash

Browse Source
This commit is contained in:
Erik Faye-Lund 2008-09-30 21:47:41 +00:00
parent 2da0d2b440
commit 2e198c3a11
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editor/trackview.cpp
View File

@ -586,6 +586,8 @@ void TrackView::setEditRow(int newEditRow)
void TrackView::setEditTrack(int newEditTrack) void TrackView::setEditTrack(int newEditTrack)
{ {
assert(size_t(newEditTrack) < document->getTrackCount());
int oldEditTrack = editTrack; int oldEditTrack = editTrack;
editTrack = newEditTrack; editTrack = newEditTrack;
@ -901,7 +903,8 @@ LRESULT TrackView::onKeyDown(UINT keyCode, UINT /*flags*/)
if (0 < editTrack) std::swap(document->trackOrder[editTrack], document->trackOrder[editTrack - 1]); if (0 < editTrack) std::swap(document->trackOrder[editTrack], document->trackOrder[editTrack - 1]);
else MessageBeep(-1); else MessageBeep(-1);
} }
setEditTrack(editTrack - 1); if (0 != document->getTrackCount()) setEditTrack(editTrack - 1);
else MessageBeep(-1);
break; break;
case VK_RIGHT: case VK_RIGHT:
@ -910,7 +913,8 @@ LRESULT TrackView::onKeyDown(UINT keyCode, UINT /*flags*/)
if (int(document->trackOrder.size()) > editTrack + 1) std::swap(document->trackOrder[editTrack], document->trackOrder[editTrack + 1]); if (int(document->trackOrder.size()) > editTrack + 1) std::swap(document->trackOrder[editTrack], document->trackOrder[editTrack + 1]);
else MessageBeep(-1); else MessageBeep(-1);
} }
setEditTrack(editTrack + 1); if (0 != document->getTrackCount()) setEditTrack(editTrack + 1);
else MessageBeep(-1);
break; break;
case VK_PRIOR: case VK_PRIOR: