diff options
| author | Ariel Manzur <ariel@godotengine.org> | 2015-12-21 09:17:15 -0300 |
|---|---|---|
| committer | Ariel Manzur <ariel@godotengine.org> | 2015-12-21 09:17:15 -0300 |
| commit | 0576e1e28f41f103cd06452d810a04265e3574cc (patch) | |
| tree | 817c1a5e3ca8b8f786e013c0322e4052e7f85d59 /servers/audio | |
| parent | 72a6b137ba256f5198843f8980107c350d52e5ca (diff) | |
| parent | 15429d6ac95acb044c9eebd64356f33e7e5d14ef (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'servers/audio')
| -rw-r--r-- | servers/audio/audio_server_sw.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/servers/audio/audio_server_sw.cpp b/servers/audio/audio_server_sw.cpp index 8ab220d189..37c4856de5 100644 --- a/servers/audio/audio_server_sw.cpp +++ b/servers/audio/audio_server_sw.cpp @@ -767,9 +767,10 @@ void AudioServerSW::free(RID p_id) { void AudioServerSW::_thread_func(void *self) { - AudioServerSW *as=(AudioServerSW *)self; + as->thread->set_name("AudioServerSW"); + while (!as->exit_update_thread) { as->_update_streams(true); OS::get_singleton()->delay_usec(5000); @@ -810,7 +811,6 @@ void AudioServerSW::init() { #ifndef NO_AUDIO_THREADS exit_update_thread=false; thread = Thread::create(_thread_func,this); - thread->set_name("AudioServerSW"); #endif } |