summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-12-18 22:09:08 +0000
committerCarl Hetherington <cth@carlh.net>2018-12-18 22:09:08 +0000
commitfa332470e8544554fbae265f840b249ebdf852f5 (patch)
tree3b5e82c9ea2e490339683f9c082aded93150907b /src
parentd4658d7d79bcf5bfa52f6f26eee3506bb8db82f5 (diff)
swaroop: only disable next button if skippable (not previous).
Diffstat (limited to 'src')
-rw-r--r--src/wx/swaroop_controls.cc8
-rw-r--r--src/wx/swaroop_controls.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/wx/swaroop_controls.cc b/src/wx/swaroop_controls.cc
index f38fd3343..83cbd5244 100644
--- a/src/wx/swaroop_controls.cc
+++ b/src/wx/swaroop_controls.cc
@@ -46,7 +46,7 @@ SwaroopControls::SwaroopControls (wxWindow* parent, shared_ptr<FilmViewer> viewe
, _next_button (new Button(this, "Next"))
, _previous_button (new Button(this, "Previous"))
, _current_disable_timeline (false)
- , _current_disable_next_previous (false)
+ , _current_disable_next (false)
{
_button_sizer->Add (_previous_button, 0, wxEXPAND);
_button_sizer->Add (_play_button, 0, wxEXPAND);
@@ -191,8 +191,8 @@ SwaroopControls::setup_sensitivity ()
_pause_button->Enable (_viewer->playing());
_slider->Enable (!_current_disable_timeline);
_spl_view->Enable (!_viewer->playing());
- _next_button->Enable (!_current_disable_next_previous && can_do_next());
- _previous_button->Enable (!_current_disable_next_previous && can_do_previous());
+ _next_button->Enable (!_current_disable_next && can_do_next());
+ _previous_button->Enable (can_do_previous());
}
void
@@ -375,7 +375,7 @@ SwaroopControls::update_current_content ()
SPLEntry const & e = _playlists[*_selected_playlist].get()[_selected_playlist_position];
_current_disable_timeline = e.disable_timeline;
- _current_disable_next_previous = !e.skippable;
+ _current_disable_next = !e.skippable;
setup_sensitivity ();
reset_film ();
diff --git a/src/wx/swaroop_controls.h b/src/wx/swaroop_controls.h
index f09344d1a..077b16fbe 100644
--- a/src/wx/swaroop_controls.h
+++ b/src/wx/swaroop_controls.h
@@ -70,7 +70,7 @@ private:
wxTextCtrl* _log;
bool _current_disable_timeline;
- bool _current_disable_next_previous;
+ bool _current_disable_next;
std::vector<SPL> _playlists;
boost::optional<int> _selected_playlist;