From 13b8277bd3229fe2ea56b082fc34de773be42257 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 20 Jul 2013 09:42:44 +0200 Subject: [PATCH] Fix some confusing code noticed by unknown, typo fix --- android/app-android.cpp | 2 +- ui/viewgroup.cpp | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/android/app-android.cpp b/android/app-android.cpp index e318d4199a..b6cf02e05b 100644 --- a/android/app-android.cpp +++ b/android/app-android.cpp @@ -188,7 +188,7 @@ extern "C" void Java_com_henrikrydgard_libnative_NativeApp_audioInit(JNIEnv *, j optimalSampleRate = 44100; AndroidAudio_Init(&NativeMix, library_path, optimalFramesPerBuffer, optimalSampleRate); } - ILOG("NativeApp.audioShutdown() -- end"); + ILOG("NativeApp.audioInit() -- end"); } extern "C" void Java_com_henrikrydgard_libnative_NativeApp_audioShutdown(JNIEnv *, jclass) { diff --git a/ui/viewgroup.cpp b/ui/viewgroup.cpp index 712bc4c8cc..99b8b7c81a 100644 --- a/ui/viewgroup.cpp +++ b/ui/viewgroup.cpp @@ -730,9 +730,10 @@ EventReturn ChoiceStrip::OnChoiceClick(EventParams &e) { } EventParams e2; - e.a = selected_; + e2.v = views_[selected_]; + e2.a = selected_; // Dispatch immediately (we're already on the UI thread as we're in an event handler). - return OnChoice.Dispatch(e); + return OnChoice.Dispatch(e2); } void ChoiceStrip::SetSelection(int sel) { @@ -834,4 +835,4 @@ void UpdateViewHierarchy(const InputState &input_state, ViewGroup *root) { root->Update(input_state); DispatchEvents(); } -} // namespace UI \ No newline at end of file +} // namespace UI