diff options
Diffstat (limited to 'libs/ardour/session_state.cc')
| -rw-r--r-- | libs/ardour/session_state.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 6376f1ab0b..95eb36c07f 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -1316,8 +1316,9 @@ Session::set_state (const XMLNode& node, int version) _base_frame_rate = atoi (prop->value()); _nominal_frame_rate = _base_frame_rate; - if (_nominal_frame_rate != _current_frame_rate) { - boost::optional<int> r = AskAboutSampleRateMismatch (_nominal_frame_rate, _current_frame_rate); + assert (AudioEngine::instance()->running ()); + if (_base_frame_rate != AudioEngine::instance()->sample_rate ()) { + boost::optional<int> r = AskAboutSampleRateMismatch (_base_frame_rate, _current_frame_rate); if (r.get_value_or (0)) { goto out; } |