From f6bae0415df096c08e63e62eb997764714b7320f Mon Sep 17 00:00:00 2001 From: Nathan Shurtz Date: Thu, 4 Dec 2025 10:15:58 -0600 Subject: [PATCH] Fix #396 Correct bad merge conflict resolution in worker_impl.cpp --- kotlin/src/main/cpp/src/models/worker_impl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kotlin/src/main/cpp/src/models/worker_impl.cpp b/kotlin/src/main/cpp/src/models/worker_impl.cpp index 375964b0..000b268e 100644 --- a/kotlin/src/main/cpp/src/models/worker_impl.cpp +++ b/kotlin/src/main/cpp/src/models/worker_impl.cpp @@ -53,7 +53,7 @@ void WorkerImpl::start(jobject ktRenderer, m_lastFrameTime = frameTime; m_isStarted = true; // Conditional from CMake on whether to include miniaudio -#ifdef WITH_AUDIO +#ifdef WITH_RIVE_AUDIO if (auto engine = rive::AudioEngine::RuntimeEngine(false)) { engine->start();