mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-15 19:16:40 +01:00
finished merge of cairocanvas with windows and windows+cc branches
This commit is contained in:
commit
658bb3ccd4
101 changed files with 4097 additions and 237 deletions
|
|
@ -759,7 +759,7 @@ ARDOUR_UI::starting ()
|
|||
nsm->check ();
|
||||
|
||||
Glib::usleep (i);
|
||||
if (nsm->is_active())
|
||||
if (nsm->is_active()) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -770,9 +770,8 @@ ARDOUR_UI::starting ()
|
|||
// wait for open command from nsm server
|
||||
for ( i = 0; i < 5000; ++i) {
|
||||
nsm->check ();
|
||||
|
||||
Glib::usleep (1000);
|
||||
if (nsm->client_id ())
|
||||
if (nsm->client_id ()) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue