From 2716296a10426f8eadfa9609748df49aa2f11db3 Mon Sep 17 00:00:00 2001
From: Ethan Lee <flibitijibibo@gmail.com>
Date: Wed, 8 Jul 2020 14:43:04 -0400
Subject: [PATCH] Haiku: Keep the option visible, but note the bug

---
 desktop_version/src/Game.cpp   | 2 --
 desktop_version/src/Input.cpp  | 4 ++--
 desktop_version/src/Render.cpp | 6 ++++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp
index ab70b62d..0d0b25d5 100644
--- a/desktop_version/src/Game.cpp
+++ b/desktop_version/src/Game.cpp
@@ -6833,9 +6833,7 @@ void Game::createmenu( enum Menu::MenuName t, bool samemenu/*= false*/ )
         option("toggle filter");
         option("toggle analogue");
         option("toggle fps");
-#ifndef __HAIKU__ // FIXME: Remove after SDL VSync bug is fixed! -flibit
         option("toggle vsync");
-#endif
         option("return");
         menuyoff = -10;
         break;
diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp
index 8c701863..91bf975e 100644
--- a/desktop_version/src/Input.cpp
+++ b/desktop_version/src/Input.cpp
@@ -367,15 +367,15 @@ void menuactionpress()
             game.over30mode = !game.over30mode;
             game.savestats();
             break;
-#ifndef __HAIKU__ // FIXME: Remove after SDL VSync bug is fixed! -flibit
         case 6:
             //toggle vsync
             music.playef(11);
+#ifndef __HAIKU__ // FIXME: Remove after SDL VSync bug is fixed! -flibit
             graphics.screenbuffer->vsync = !graphics.screenbuffer->vsync;
             graphics.screenbuffer->resetRendererWorkaround();
             game.savestats();
-            break;
 #endif
+            break;
         default:
             //back
             music.playef(11);
diff --git a/desktop_version/src/Render.cpp b/desktop_version/src/Render.cpp
index 741a0e22..727b2be0 100644
--- a/desktop_version/src/Render.cpp
+++ b/desktop_version/src/Render.cpp
@@ -228,10 +228,13 @@ void menurender()
                 graphics.Print(-1, 95, "Current mode: Over 30 FPS", tr, tg, tb, true);
             }
             break;
-#ifndef __HAIKU__ // FIXME: Remove after SDL VSync bug is fixed! -flibit
         case 6:
             graphics.bigprint(-1, 30, "Toggle VSync", tr, tg, tb, true);
+#ifdef __HAIKU__ // FIXME: Remove after SDL VSync bug is fixed! -flibit
+            graphics.Print(-1, 65, "Edit the config file on Haiku!", tr, tg, tb, true);
+#else
             graphics.Print(-1, 65, "Turn VSync on or off.", tr, tg, tb, true);
+#endif
 
             if (!graphics.screenbuffer->vsync)
             {
@@ -242,7 +245,6 @@ void menurender()
                 graphics.Print(-1, 95, "Current mode: VSYNC ON", tr, tg, tb, true);
             }
             break;
-#endif
         }
         break;
     case Menu::credits: