Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-23 05:24:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix badusb

Browse Source
This commit is contained in:
MX
2022-08-04 22:30:44 +03:00
parent 2731b3bf57
commit ac1a53dbf8
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
applications/bad_usb/bad_usb_app.c
View File

@@ -104,7 +104,7 @@ BadUsbApp* bad_usb_app_alloc(char* arg) {
if(!string_empty_p(app->file_path)) { if(!string_empty_p(app->file_path)) {
scene_manager_next_scene(app->scene_manager, BadUsbSceneWork); scene_manager_next_scene(app->scene_manager, BadUsbSceneWork);
} else { } else {
string_set_str(app->file_path, BAD_USB_APP_PATH_SCRIPT_FOLDER); string_set_str(app->file_path, BAD_USB_APP_BASE_FOLDER);
scene_manager_next_scene(app->scene_manager, BadUsbSceneFileSelect); scene_manager_next_scene(app->scene_manager, BadUsbSceneFileSelect);
} }
} }
@@ -115,14 +115,14 @@ BadUsbApp* bad_usb_app_alloc(char* arg) {
void bad_usb_app_free(BadUsbApp* app) { void bad_usb_app_free(BadUsbApp* app) {
furi_assert(app); furi_assert(app);
if(app->bad_usb_script) { if(app->bad_usb_script != NULL) {
bad_usb_script_close(app->bad_usb_script); bad_usb_script_close(app->bad_usb_script);
app->bad_usb_script = NULL; app->bad_usb_script = NULL;
} }
// Views // Views
view_dispatcher_remove_view(app->view_dispatcher, BadUsbAppViewWork); view_dispatcher_remove_view(app->view_dispatcher, BadUsbAppViewWork);
view_dispatcher_remove_view(app->view_dispatcher, BadUsbAppViewConfigLayout);
bad_usb_free(app->bad_usb_view); bad_usb_free(app->bad_usb_view);
// Custom Widget // Custom Widget

2
applications/bad_usb/bad_usb_app_i.h
View File

@@ -15,7 +15,6 @@
#include "views/bad_usb_view.h" #include "views/bad_usb_view.h"
#define BAD_USB_APP_BASE_FOLDER ANY_PATH("badusb") #define BAD_USB_APP_BASE_FOLDER ANY_PATH("badusb")
#define BAD_USB_APP_PATH_SCRIPT_FOLDER BAD_USB_APP_BASE_FOLDER
#define BAD_USB_APP_PATH_LAYOUT_FOLDER BAD_USB_APP_BASE_FOLDER "/layouts" #define BAD_USB_APP_PATH_LAYOUT_FOLDER BAD_USB_APP_BASE_FOLDER "/layouts"
#define BAD_USB_APP_SCRIPT_EXTENSION ".txt" #define BAD_USB_APP_SCRIPT_EXTENSION ".txt"
#define BAD_USB_APP_LAYOUT_EXTENSION ".kl" #define BAD_USB_APP_LAYOUT_EXTENSION ".kl"
@@ -45,5 +44,4 @@ typedef enum {
BadUsbAppViewError, BadUsbAppViewError,
BadUsbAppViewWork, BadUsbAppViewWork,
BadUsbAppViewConfig, BadUsbAppViewConfig,
BadUsbAppViewConfigLayout,
} BadUsbAppView; } BadUsbAppView;