diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-09-16 17:11:54 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-09-16 17:11:54 -0400 |
| commit | 31c0a536baf83ac234172c8eea6b38d43f1dcf0f (patch) | |
| tree | ffbf3385b99c32072def9d30cacd54ea378d4923 /gtk2_ardour/session_dialog.cc | |
| parent | 69b44ee82904744bd4e9ed6801ca9d0c42a49738 (diff) | |
fix missed but required merge resolution related to UIConfiguration's new status as a singleton in this branch.
Diffstat (limited to 'gtk2_ardour/session_dialog.cc')
| -rw-r--r-- | gtk2_ardour/session_dialog.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk2_ardour/session_dialog.cc b/gtk2_ardour/session_dialog.cc index 8e98de2868..c08328ba5d 100644 --- a/gtk2_ardour/session_dialog.cc +++ b/gtk2_ardour/session_dialog.cc @@ -52,6 +52,7 @@ #include "engine_dialog.h" #include "i18n.h" #include "tooltips.h" +#include "ui_config.h" #include "utils.h" using namespace std; @@ -793,7 +794,7 @@ SessionDialog::redisplay_recent_sessions () pColumn->set_sort_column (recent_session_columns.time_modified); // unixtime } - int32_t sort = ARDOUR_UI::config()->get_recent_session_sort(); + int32_t sort = UIConfiguration::instance().get_recent_session_sort(); if (abs(sort) != 1 + recent_session_columns.visible_name.index () && abs(sort) != 1 + recent_session_columns.time_modified.index ()) { sort = 1 + recent_session_columns.visible_name.index(); @@ -810,8 +811,8 @@ SessionDialog::recent_session_sort_changed () SortType order; if (recent_session_model->get_sort_column_id (column, order)) { int32_t sort = (column + 1) * (order == Gtk::SORT_DESCENDING ? -1 : 1); - if (sort != ARDOUR_UI::config()->get_recent_session_sort()) { - ARDOUR_UI::config()->set_recent_session_sort(sort); + if (sort != UIConfiguration::instance().get_recent_session_sort()) { + UIConfiguration::instance().set_recent_session_sort(sort); } } } |