mirror of
https://github.com/AlexandreRouma/SDRPlusPlus.git
synced 2024-11-10 04:37:37 +01:00
Merge branch 'master' of https://github.com/AlexandreRouma/SDRPlusPlus
This commit is contained in:
commit
c57482771b
@ -368,7 +368,7 @@ namespace backend {
|
||||
|
||||
jint jni_return = java_vm->GetEnv((void**)&java_env, JNI_VERSION_1_6);
|
||||
if (jni_return == JNI_ERR)
|
||||
throw std::runtime_error("Could not get JNI environement");
|
||||
throw std::runtime_error("Could not get JNI environment");
|
||||
|
||||
jni_return = java_vm->AttachCurrentThread(&java_env, NULL);
|
||||
if (jni_return != JNI_OK)
|
||||
@ -380,7 +380,7 @@ namespace backend {
|
||||
|
||||
jmethodID method_id = java_env->GetMethodID(native_activity_clazz, "getAppDir", "()Ljava/lang/String;");
|
||||
if (method_id == NULL)
|
||||
throw std::runtime_error("Could not get methode ID");
|
||||
throw std::runtime_error("Could not get method ID");
|
||||
|
||||
jstring jstr = (jstring)java_env->CallObjectMethod(app->activity->clazz, method_id);
|
||||
|
||||
|
@ -79,7 +79,7 @@ int CommandArgsParser::parse(int argc, char* argv[]) {
|
||||
carg.bval = true;
|
||||
}
|
||||
else {
|
||||
printf("Invald argument, expected bool (true, false, on, off, 1, 0)\n");
|
||||
printf("Invalid argument, expected bool (true, false, on, off, 1, 0)\n");
|
||||
showHelp();
|
||||
return -1;
|
||||
}
|
||||
@ -89,7 +89,7 @@ int CommandArgsParser::parse(int argc, char* argv[]) {
|
||||
carg.ival = std::stoi(arg);
|
||||
}
|
||||
catch (std::exception e) {
|
||||
printf("Invald argument, failed to parse integer\n");
|
||||
printf("Invalid argument, failed to parse integer\n");
|
||||
showHelp();
|
||||
return -1;
|
||||
}
|
||||
@ -99,7 +99,7 @@ int CommandArgsParser::parse(int argc, char* argv[]) {
|
||||
carg.fval = std::stod(arg);
|
||||
}
|
||||
catch (std::exception e) {
|
||||
printf("Invald argument, failed to parse float\n");
|
||||
printf("Invalid argument, failed to parse float\n");
|
||||
showHelp();
|
||||
return -1;
|
||||
}
|
||||
|
@ -330,7 +330,7 @@ int sdrpp_main(int argc, char* argv[]) {
|
||||
int biRes = backend::init(resDir);
|
||||
if (biRes < 0) { return biRes; }
|
||||
|
||||
// Intialize SmGui in normal mode
|
||||
// Initialize SmGui in normal mode
|
||||
SmGui::init(false);
|
||||
|
||||
if (!style::loadFonts(resDir)) { return -1; }
|
||||
|
@ -84,7 +84,7 @@ namespace server {
|
||||
core::configManager.release();
|
||||
modulesDir = std::filesystem::absolute(modulesDir).string();
|
||||
|
||||
// Intialize SmGui in server mode
|
||||
// Initialize SmGui in server mode
|
||||
SmGui::init(true);
|
||||
|
||||
spdlog::info("Loading modules");
|
||||
|
Loading…
Reference in New Issue
Block a user