Skip to content

Commit c486fe0

Browse files
mutexlox-signalpadenot
authored andcommitted
Only start log thread if using CUBEB_LOG_VERBOSE.
1 parent 586c080 commit c486fe0

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/cubeb_log.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,10 +207,14 @@ cubeb_log_set(cubeb_log_level log_level, cubeb_log_callback log_callback)
207207
// nullptr, to prevent a TOCTOU race between checking the pointer
208208
if (log_callback && log_level != CUBEB_LOG_DISABLED) {
209209
g_cubeb_log_callback = log_callback;
210-
cubeb_async_logger::get().start();
210+
if (log_level == CUBEB_LOG_VERBOSE) {
211+
cubeb_async_logger::get().start();
212+
}
211213
} else if (!log_callback || CUBEB_LOG_DISABLED) {
212214
g_cubeb_log_callback = cubeb_noop_log_callback;
213215
// This returns once the thread has joined.
216+
// This is safe even if CUBEB_LOG_VERBOSE was not set; the thread will
217+
// simply not be joinable.
214218
cubeb_async_logger::get().stop();
215219
} else {
216220
assert(false && "Incorrect parameters passed to cubeb_log_set");

0 commit comments

Comments
 (0)