[geany/geany] 1a9451: Fix NULL tags array warning in document_highlight_tags

Nick Treleaven git-noreply at xxxxx
Mon Apr 23 15:17:40 UTC 2012


Branch:      refs/heads/master
Author:      Nick Treleaven <nick.treleaven at btinternet.com>
Committer:   Nick Treleaven <nick.treleaven at btinternet.com>
Date:        Mon, 23 Apr 2012 15:17:40
Commit:      1a9451bfc4915ada3ab2d0743293532f574cad00
             https://github.com/geany/geany/commit/1a9451bfc4915ada3ab2d0743293532f574cad00

Log Message:
-----------
Fix NULL tags array warning in document_highlight_tags


Modified Paths:
--------------
    src/document.c

Modified: src/document.c
4 files changed, 3 insertions(+), 1 deletions(-)
===================================================================
@@ -2312,6 +2312,8 @@ void document_highlight_tags(GeanyDocument *doc)
 		default:
 			return; /* early out if type keywords are not supported */
 	}
+	if (!app->tm_workspace->work_object.tags_array)
+		return;
 
 	/* get any type keywords and tell scintilla about them
 	 * this will cause the type keywords to be colourized in scintilla */
@@ -2895,7 +2897,7 @@ gboolean document_check_disk_status(GeanyDocument *doc, gboolean force)
 	g_return_val_if_fail(doc != NULL, FALSE);
 
 	/* ignore remote files and documents that have never been saved to disk */
-	if (notebook_switch_in_progress() || file_prefs.disk_check_timeout == 0 
+	if (notebook_switch_in_progress() || file_prefs.disk_check_timeout == 0
 			|| doc->real_path == NULL || doc->priv->is_remote)
 		return FALSE;
 


@@ Diff output truncated at 100000 characters. @@


--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).



More information about the Commits mailing list