7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-27 01:45:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of https://github.com/geode-sdk/geode into main

Browse source
This commit is contained in:
HJfod 2024-02-14 14:14:22 +02:00
commit 143cccc6c4
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
loader/src/platform/android/LoaderImpl.cpp
View file

@ -41,8 +41,6 @@ bool Loader::Impl::supportsLaunchArguments() const {
return true;
}
#include <loader/console.hpp>
std::string Loader::Impl::getLaunchCommand() const {
std::string launchArgs = "";
@ -60,9 +58,6 @@ std::string Loader::Impl::getLaunchCommand() const {
if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) == JNI_OK) {
env->ExceptionClear();
}
// note to self: remove this in about a week (02/11 maybe)
console::messageBox("Outdated launcher detected", "A very outdated version of the launcher is currently in use. Please update your launcher for the latest bugfixes and features.", Severity::Warning);
}
return launchArgs;

2
loader/src/platform/android/util.cpp
View file

@ -217,7 +217,7 @@ void file::pickFile(
JniMethodInfo t;
if (JniHelper::getStaticMethodInfo(t, "com/geode/launcher/utils/GeodeUtils", method.c_str(), "(Ljava/lang/String;)Z")) {
jstring stringArg1 = t.env->NewStringUTF(options.defaultPath.value_or(ghc::filesystem::path()).string().c_str());
jstring stringArg1 = t.env->NewStringUTF(options.defaultPath.value_or(ghc::filesystem::path()).filename().string().c_str());
jboolean result = t.env->CallStaticBooleanMethod(t.classID, t.methodID, stringArg1);