Fix merge issues

This commit is contained in:
MX 2022-12-08 09:04:22 +03:00
parent 1fc67f76a2
commit 349ef2ecb8
No known key found for this signature in database
GPG Key ID: 6C4C311DFD4B4AB5

View File

@ -7,8 +7,9 @@ static bool bad_usb_file_select(BadUsbApp* bad_usb) {
furi_assert(bad_usb);
DialogsFileBrowserOptions browser_options;
dialog_file_browser_set_basic_options(&browser_options, BAD_USB_APP_EXTENSION, &I_badusb_10px);
browser_options.base_path = BAD_USB_APP_PATH_FOLDER;
dialog_file_browser_set_basic_options(
&browser_options, BAD_USB_APP_SCRIPT_EXTENSION, &I_badusb_10px);
browser_options.base_path = BAD_USB_APP_BASE_FOLDER;
browser_options.skip_assets = true;
// Input events and views are managed by file_browser