fix subghz double click after delete, fix rename bug, fix unirf

This commit is contained in:
MX 2022-10-06 15:10:08 +03:00
parent ac286dfed8
commit b61e41163b
No known key found for this signature in database
GPG Key ID: 6C4C311DFD4B4AB5
3 changed files with 8 additions and 7 deletions

View File

@ -31,7 +31,7 @@ bool subghz_scene_delete_success_on_event(void* context, SceneManagerEvent event
scene_manager_next_scene(subghz->scene_manager, SubGhzSceneReadRAW);
} else if(scene_manager_search_and_switch_to_previous_scene(
subghz->scene_manager, SubGhzSceneSaved)) {
scene_manager_next_scene(subghz->scene_manager, SubGhzSceneSaved);
//scene_manager_next_scene(subghz->scene_manager, SubGhzSceneSaved);
} else {
scene_manager_search_and_switch_to_previous_scene(
subghz->scene_manager, SubGhzSceneStart);

View File

@ -47,6 +47,7 @@ void subghz_scene_save_name_on_enter(void* context) {
//highlighting the entire filename by default
dev_name_empty = true;
} else {
furi_string_reset(subghz->file_path_tmp);
furi_string_set(subghz->file_path_tmp, subghz->file_path);
path_extract_dirname(furi_string_get_cstr(subghz->file_path), dir_name);
path_extract_filename(subghz->file_path, file_name, true);
@ -84,7 +85,7 @@ void subghz_scene_save_name_on_enter(void* context) {
bool subghz_scene_save_name_on_event(void* context, SceneManagerEvent event) {
SubGhz* subghz = context;
if(event.type == SceneManagerEventTypeBack) {
if(!strcmp(subghz->file_name_tmp, "") ||
if(!(strcmp(subghz->file_name_tmp, "") == 0) ||
scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneReadRAW) !=
SubGhzCustomEventManagerNoSet) {
furi_string_set(subghz->file_path, subghz->file_path_tmp);

View File

@ -994,7 +994,7 @@ int32_t unirfremix_app(void* p) {
if(app->up_enabled) {
if(app->processing == 0) {
furi_string_reset(app->signal);
app->signal = app->up_file;
furi_string_set(app->signal, app->up_file);
app->button = 1;
app->processing = 1;
}
@ -1012,7 +1012,7 @@ int32_t unirfremix_app(void* p) {
if(app->down_enabled) {
if(app->processing == 0) {
furi_string_reset(app->signal);
app->signal = app->down_file;
furi_string_set(app->signal, app->down_file);
app->button = 2;
app->processing = 1;
}
@ -1030,7 +1030,7 @@ int32_t unirfremix_app(void* p) {
if(app->right_enabled) {
if(app->processing == 0) {
furi_string_reset(app->signal);
app->signal = app->right_file;
furi_string_set(app->signal, app->right_file);
app->button = 3;
app->processing = 1;
}
@ -1048,7 +1048,7 @@ int32_t unirfremix_app(void* p) {
if(app->left_enabled) {
if(app->processing == 0) {
furi_string_reset(app->signal);
app->signal = app->left_file;
furi_string_set(app->signal, app->left_file);
app->button = 4;
app->processing = 1;
}
@ -1066,7 +1066,7 @@ int32_t unirfremix_app(void* p) {
if(app->ok_enabled) {
if(app->processing == 0) {
furi_string_reset(app->signal);
app->signal = app->ok_file;
furi_string_set(app->signal, app->ok_file);
app->button = 5;
app->processing = 1;
}