sharpetronics/geany
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge c6247aaaf75842219d6c9b319ab700d7c82bb418 into e59a2412f9c4d316f6eab1a4ac5a77469a326d0a

Browse Source
This commit is contained in:
Avinash Sonawane 2022-10-16 20:02:36 -06:00 committed by GitHub
commit aa7d02df2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/build.c
View File

@ -448,9 +448,10 @@ gchar **build_get_regex(GeanyBuildGroup grp, GeanyFiletype *ft, guint *from)
GeanyDocument *doc = document_get_current(); GeanyDocument *doc = document_get_current();
if (doc != NULL) if (doc != NULL)
ft = doc->file_type; ft = doc->file_type;
if (ft == NULL)
return NULL;
} }
if (ft == NULL)
return NULL;
return_nonblank_regex(GEANY_BCS_PROJ, ft->priv->projerror_regex_string); return_nonblank_regex(GEANY_BCS_PROJ, ft->priv->projerror_regex_string);
return_nonblank_regex(GEANY_BCS_HOME_FT, ft->priv->homeerror_regex_string); return_nonblank_regex(GEANY_BCS_HOME_FT, ft->priv->homeerror_regex_string);
return_nonblank_regex(GEANY_BCS_FT, ft->error_regex_string); return_nonblank_regex(GEANY_BCS_FT, ft->error_regex_string);

3
src/filetypes.c
View File

@ -1284,7 +1284,10 @@ gboolean filetypes_parse_error_message(GeanyFiletype *ft, const gchar *message,
doc = document_get_current(); doc = document_get_current();
if (doc != NULL) if (doc != NULL)
ft = doc->file_type; ft = doc->file_type;
if (ft == NULL)
return FALSE;
} }
tmp = build_get_regex(build_info.grp, ft, NULL); tmp = build_get_regex(build_info.grp, ft, NULL);
if (tmp == NULL) if (tmp == NULL)
return FALSE; return FALSE;