when building context menu for click on mixer strip, ensure clicked-on strip sets...

[ardour.git] / gtk2_ardour / engine_dialog.cc

diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc
index a0cfee8089ea6489d1a4b4bb2b66691f0ba1a36f..c88c836dfe72ab2b9087caa4bc0092c02004b29e 100644 (file)
--- a/gtk2_ardour/engine_dialog.cc
+++ b/gtk2_ardour/engine_dialog.cc
@@ -324,6 +324,10 @@ void
 EngineControl::on_show ()
 {
        ArdourDialog::on_show ();
+       if (!ARDOUR::AudioEngine::instance()->current_backend() || !ARDOUR::AudioEngine::instance()->running()) {
+               // re-check _have_control (jackd running) see #6041
+               backend_changed ();
+       }
        device_changed ();
        ok_button->grab_focus();
 }
@@ -1035,8 +1039,8 @@ EngineControl::bufsize_as_string (uint32_t sz)
        /* Translators: "samples" is always plural here, so no
           need for plural+singular forms.
         */
-       char buf[32];
-       snprintf (buf, sizeof (buf), _("%u samples"), sz);
+       char buf[64];
+       snprintf (buf, sizeof (buf), "%u %s", sz, P_("sample", "samples", sz));
        return buf;
 }