mirrors/unleashed-firmware
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2025-12-13 13:09:49 +04:00
Code Issues Activity

Merge remote-tracking branch 'OFW/dev' into dev

Browse Source
This commit is contained in:
MX
2024-05-19 03:45:07 +03:00
parent 51bb9c0a0a de4b086083
commit fb6070f29d
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
applications/services/gui/view.c
View File

@@ -97,10 +97,11 @@ void view_free_model(View* view) {
furi_mutex_free(model->mutex); furi_mutex_free(model->mutex);
free(model->data); free(model->data);
free(model); free(model);
view->model = NULL;
} else { } else {
furi_crash(); furi_crash();
} }
view->model = NULL;
view->model_type = ViewModelTypeNone;
} }
void* view_get_model(View* view) { void* view_get_model(View* view) {

2
applications/system/js_app/js_thread.c
View File

@@ -389,7 +389,7 @@ static int32_t js_thread(void* arg) {
} }
const char* stack_trace = mjs_get_stack_trace(mjs); const char* stack_trace = mjs_get_stack_trace(mjs);
if(stack_trace != NULL) { if(stack_trace != NULL) {
FURI_LOG_E(TAG, "Stack trace:\n%s", stack_trace); FURI_LOG_E(TAG, "Stack trace:\r\n%s", stack_trace);
if(worker->app_callback) { if(worker->app_callback) {
worker->app_callback(JsThreadEventErrorTrace, stack_trace, worker->context); worker->app_callback(JsThreadEventErrorTrace, stack_trace, worker->context);
} }

2
lib/mjs/mjs_core.c
View File

@@ -280,7 +280,7 @@ static void mjs_append_stack_trace_line(struct mjs* mjs, size_t offset) {
const char* filename = mjs_get_bcode_filename_by_offset(mjs, offset); const char* filename = mjs_get_bcode_filename_by_offset(mjs, offset);
int line_no = mjs_get_lineno_by_offset(mjs, offset); int line_no = mjs_get_lineno_by_offset(mjs, offset);
char* new_line = NULL; char* new_line = NULL;
const char* fmt = "at %s:%d\n"; const char* fmt = "\tat %s:%d\r\n";
if(filename == NULL) { if(filename == NULL) {
// fprintf( // fprintf(
// stderr, // stderr,