ardour/livetrax
13
0
Fork 0
Code

Continue without NSM if server does not respond

Browse Source
This commit is contained in:
Robin Gareus 2020-05-13 18:34:00 +02:00
parent 10200f5e29
commit bec9914f37
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk2_ardour/ardour_ui_startup.cc
View File

@ -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;
}