summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2020-05-13 18:34:00 +0200
committerRobin Gareus <robin@gareus.org>2020-05-13 18:34:00 +0200
commitbec9914f37771be11e9795c430f1e40d3f06ce99 (patch)
treebba103dd0759cb309b7919ba62ab6055f00fc3fb /gtk2_ardour
parent10200f5e29e946fbb133500f279fdb0cd2932e6b (diff)
Continue without NSM if server does not respond
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/ardour_ui_startup.cc12
1 files changed, 11 insertions, 1 deletions
diff --git a/gtk2_ardour/ardour_ui_startup.cc b/gtk2_ardour/ardour_ui_startup.cc
index 4569ac4ab6..98fd532363 100644
--- a/gtk2_ardour/ardour_ui_startup.cc
+++ b/gtk2_ardour/ardour_ui_startup.cc
@@ -403,8 +403,14 @@ ARDOUR_UI::nsm_init ()
}
}
if (i == 5000) {
+#if 0 // USE AFTER STRINGFREEZE 6.0
+ error << _("NSM server did not announce itself. Continuing without NSM.") << endmsg;
+#else
error << _("NSM server did not announce itself") << endmsg;
- return -1;
+#endif
+ delete nsm;
+ nsm = 0;
+ return 0;
}
// wait for open command from nsm server
for ( i = 0; i < 5000; ++i) {
@@ -417,6 +423,8 @@ ARDOUR_UI::nsm_init ()
if (i == 5000) {
error << _("NSM: no client ID provided") << endmsg;
+ delete nsm;
+ nsm = 0;
return -1;
}
@@ -424,6 +432,8 @@ ARDOUR_UI::nsm_init ()
_session->set_nsm_state( nsm->is_active() );
} else {
error << _("NSM: no session created") << endmsg;
+ delete nsm;
+ nsm = 0;
return -1;
}