OSC: don't restore User preset before writing new one
This commit is contained in:
parent
4a953174c3
commit
22d1f1268b
@ -646,13 +646,6 @@ OSC_GUI::calculate_feedback ()
|
||||
current_feedback.set_text(string_compose("%1", fbvalue));
|
||||
}
|
||||
|
||||
void
|
||||
OSC_GUI::push_feedback ()
|
||||
{
|
||||
cp.set_defaultfeedback (fbvalue);
|
||||
save_user ();
|
||||
}
|
||||
|
||||
void
|
||||
OSC_GUI::calculate_strip_types ()
|
||||
{
|
||||
@ -691,13 +684,6 @@ OSC_GUI::calculate_strip_types ()
|
||||
current_strip_types.set_text(string_compose("%1", stvalue));
|
||||
}
|
||||
|
||||
void
|
||||
OSC_GUI::push_strip_types ()
|
||||
{
|
||||
cp.set_defaultstrip (stvalue);
|
||||
save_user ();
|
||||
}
|
||||
|
||||
void
|
||||
OSC_GUI::set_bitsets ()
|
||||
{
|
||||
@ -706,8 +692,9 @@ OSC_GUI::set_bitsets ()
|
||||
}
|
||||
calculate_strip_types ();
|
||||
calculate_feedback ();
|
||||
push_strip_types ();
|
||||
push_feedback ();
|
||||
cp.set_defaultstrip (stvalue);
|
||||
cp.set_defaultfeedback (fbvalue);
|
||||
save_user ();
|
||||
}
|
||||
|
||||
void
|
||||
@ -766,7 +753,6 @@ OSC_GUI::save_user ()
|
||||
if (preset_busy) {
|
||||
return;
|
||||
}
|
||||
preset_combo.set_active (2);
|
||||
std::string fullpath = user_preset_directory();
|
||||
|
||||
if (g_mkdir_with_parents (fullpath.c_str(), 0755) < 0) {
|
||||
@ -812,6 +798,7 @@ OSC_GUI::save_user ()
|
||||
if (!tree.write (fullpath)) {
|
||||
error << string_compose ("MCP profile not saved to %1", fullpath) << endmsg;
|
||||
}
|
||||
preset_combo.set_active (2);
|
||||
|
||||
}
|
||||
|
||||
|
@ -76,7 +76,6 @@ private:
|
||||
// Strip types calculator
|
||||
uint32_t def_strip;
|
||||
void calculate_strip_types ();
|
||||
void push_strip_types ();
|
||||
Gtk::Label current_strip_types;
|
||||
Gtk::CheckButton audio_tracks;
|
||||
Gtk::CheckButton midi_tracks;
|
||||
@ -91,7 +90,6 @@ private:
|
||||
// feedback calculator
|
||||
uint32_t def_feedback;
|
||||
void calculate_feedback ();
|
||||
void push_feedback ();
|
||||
Gtk::Label current_feedback;
|
||||
Gtk::CheckButton strip_buttons_button;
|
||||
Gtk::CheckButton strip_control_button;
|
||||
|
Loading…
Reference in New Issue
Block a user