From dae2be8c48e57ab22a6f110e5a113439dfb27291 Mon Sep 17 00:00:00 2001 From: robxnano <89391914+robxnano@users.noreply.github.com> Date: Wed, 7 Sep 2022 00:03:14 +0100 Subject: [PATCH] ifdefs weren't placed correctly --- BasiliskII/src/SDL/audio_sdl.cpp | 8 +++++--- BasiliskII/src/SDL/video_sdl.cpp | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/BasiliskII/src/SDL/audio_sdl.cpp b/BasiliskII/src/SDL/audio_sdl.cpp index f0386471..84cb4d9d 100644 --- a/BasiliskII/src/SDL/audio_sdl.cpp +++ b/BasiliskII/src/SDL/audio_sdl.cpp @@ -379,12 +379,14 @@ static int play_startup(void *arg) { else printf("play_startup: Audio driver failed to initialize\n"); SDL_FreeWAV(wav_buffer); } -#endif return 0; } void PlayStartupSound() { SDL_CreateThread(play_startup, "", NULL); } - -#if SDL_VERSION_ATLEAST(2,0,0) +#else +void PlayStartupSound() { + // Not implemented +} +#endif diff --git a/BasiliskII/src/SDL/video_sdl.cpp b/BasiliskII/src/SDL/video_sdl.cpp index cd02ec02..3771db0c 100644 --- a/BasiliskII/src/SDL/video_sdl.cpp +++ b/BasiliskII/src/SDL/video_sdl.cpp @@ -524,6 +524,8 @@ static void set_mac_frame_buffer(SDL_monitor_desc &monitor, int depth) // Set window name and class static void set_window_name(bool mouse_grabbed) { + const char *title = PrefsFindString("title"); + std::string s = title ? title : GetString(STR_WINDOW_TITLE); int grabbed = 0; if (mouse_grabbed) {