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

Fixed crash when having no trackData

Browse Source
This commit is contained in:
Daniel Collin 2012-12-30 21:39:51 +01:00
parent f954f214de
commit 56021dd3f9
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ogl_editor/src/Editor.c
View File

@ -1076,6 +1076,13 @@ void Editor_scroll(float deltaX, float deltaY, int flags)
{ {
int current_row = s_editorData.trackViewInfo.rowPos; int current_row = s_editorData.trackViewInfo.rowPos;
int old_offset = s_editorData.trackViewInfo.startPixel; int old_offset = s_editorData.trackViewInfo.startPixel;
int start_row = 0, end_row = 10000;
if (trackData)
{
start_row = trackData->startRow;
end_row = trackData->endRow;
}
if (flags & EMGUI_KEY_ALT) if (flags & EMGUI_KEY_ALT)
{ {
@ -1095,11 +1102,11 @@ void Editor_scroll(float deltaX, float deltaY, int flags)
current_row += (int)deltaY; current_row += (int)deltaY;
if (current_row < trackData->startRow || current_row >= trackData->endRow) if (current_row < start_row || current_row >= end_row)
return; return;
s_editorData.trackViewInfo.startPixel += (int)(deltaX * 4.0f); s_editorData.trackViewInfo.startPixel += (int)(deltaX * 4.0f);
s_editorData.trackViewInfo.rowPos = eclampi(current_row, trackData->startRow, trackData->endRow); s_editorData.trackViewInfo.rowPos = eclampi(current_row, start_row, end_row);
RemoteConnection_sendSetRowCommand(s_editorData.trackViewInfo.rowPos); RemoteConnection_sendSetRowCommand(s_editorData.trackViewInfo.rowPos);