empathicqubit/lsnes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Movie editor: Don't offer out-of-movie edits in menu

Browse source 
Out-of-movie edits don't crash, those just won't work.
This commit is contained in:
Ilari Liusvaara 2013-02-04 19:50:58 +02:00
parent a1b1dd8d65
commit 590b7fb927
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/platform/wxwidgets/editor-movie.cpp
View file

@ -376,6 +376,7 @@ private:
unsigned press_index; unsigned press_index;
bool pressed; bool pressed;
bool recursing; bool recursing;
uint64_t linecount;
void do_toggle_buttons(unsigned idx, uint64_t row1, uint64_t row2); void do_toggle_buttons(unsigned idx, uint64_t row1, uint64_t row2);
void do_alter_axis(unsigned idx, uint64_t row); void do_alter_axis(unsigned idx, uint64_t row);
void do_append_frames(uint64_t count); void do_append_frames(uint64_t count);
@ -734,12 +735,14 @@ void wxeditor_movie::_moviepanel::on_mouse2(unsigned x, unsigned y, bool polarit
for(auto i : fcontrols.get_controlinfo()) { for(auto i : fcontrols.get_controlinfo()) {
unsigned off = divcnt + 1; unsigned off = divcnt + 1;
if(press_x >= i.position_left + off && press_x < i.position_left + i.reserved + off) { if(press_x >= i.position_left + off && press_x < i.position_left + i.reserved + off) {
if(i.type == 0 && press_line >= first_editable(fcontrols, i.index)) { if(i.type == 0 && press_line >= first_editable(fcontrols, i.index) &&
press_line < linecount) {
on_button = true; on_button = true;
press_index = i.index; press_index = i.index;
title = i.title; title = i.title;
} }
if(i.type == 1 && press_line >= first_editable(fcontrols, i.index)) { if(i.type == 1 && press_line >= first_editable(fcontrols, i.index) &&
press_line < linecount) {
on_axis = true; on_axis = true;
press_index = i.index; press_index = i.index;
title = i.title; title = i.title;
@ -793,6 +796,7 @@ void wxeditor_movie::_moviepanel::signal_repaint()
if(new_width > 0 && s) if(new_width > 0 && s)
m->Fit(); m->Fit();
} }
linecount = lines;
Refresh(); Refresh();
} }