Merge branch 'master' of https://github.com/olive-editor/olive into blendmodefix

2019-01-25 18:56:51 +11:00
parent 9c57219ba9 05b2f73b1e
commit b5cc221537
2 changed files with 0 additions and 2 deletions
@@ -1255,7 +1255,6 @@ void MainWindow::toolMenu_About_To_Be_Shown() {
 	set_bool_action_checked(enable_drop_on_media_to_replace);
 	set_bool_action_checked(enable_hover_focus);
 	set_bool_action_checked(set_name_and_marker);
-	set_bool_action_checked(pause_at_out_point_action);
 	set_bool_action_checked(seek_also_selects);

 	set_int_action_checked(no_autoscroll, config.autoscroll);
@@ -190,7 +190,6 @@ private:
 	QAction* enable_hover_focus;
 	QAction* set_name_and_marker;
 	QAction* loop_action;
-	QAction* pause_at_out_point_action;
 	QAction* seek_also_selects;

 	// edit menu actions