From a5bb60ab10f61ff3caaf015ba2c79c53ac6c67eb Mon Sep 17 00:00:00 2001 From: jacob1 Date: Sat, 1 Jun 2024 00:20:00 -0400 Subject: [PATCH] force is_mod to false, hide migrate button but not "open data folder" --- src/gui/options/OptionsView.cpp | 4 ++-- src/meson.build | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/options/OptionsView.cpp b/src/gui/options/OptionsView.cpp index eee9f3675d..0309c6f713 100644 --- a/src/gui/options/OptionsView.cpp +++ b/src/gui/options/OptionsView.cpp @@ -343,7 +343,7 @@ OptionsView::OptionsView() : ui::Window(ui::Point(-1, -1), ui::Point(320, 340)) } } }); scrollPanel->AddChild(dataFolderButton); - auto *migrationButton = new ui::Button(ui::Point(Size.X - 178, currentY), ui::Point(163, 16), "Migrate to shared data directory"); + /*auto *migrationButton = new ui::Button(ui::Point(Size.X - 178, currentY), ui::Point(163, 16), "Migrate to shared data directory"); migrationButton->SetActionCallback({ [] { ByteString from = Platform::originalCwd; ByteString to = Platform::sharedCwd; @@ -352,7 +352,7 @@ OptionsView::OptionsView() : ui::Window(ui::Point(-1, -1), ui::Point(320, 340)) new InformationMessage("Migration Complete", ret, false); } }); } }); - scrollPanel->AddChild(migrationButton); + scrollPanel->AddChild(migrationButton);*/ currentY += 26; } { diff --git a/src/meson.build b/src/meson.build index 7621112137..93dddd392a 100644 --- a/src/meson.build +++ b/src/meson.build @@ -4,7 +4,7 @@ app_id = get_option('app_id') mod_id = get_option('mod_id') is_snapshot = get_option('snapshot') is_beta = get_option('beta') -is_mod = mod_id > 0 +is_mod = false conf_data.set('X86', is_x86.to_string()) conf_data.set('BETA', is_beta.to_string()) conf_data.set('MOD_ID', mod_id)