SF.net SVN: geany:[3697] trunk/src/editor.c

[eht16 at users.sourceforge.net]

Revision: 3697
          http://geany.svn.sourceforge.net/geany/?rev=3697&view=rev
Author:   eht16
Date:     2009-04-07 22:08:50 +0000 (Tue, 07 Apr 2009)

Log Message:
-----------
Silently ignore a request to start auto-completion when the document has no filetype set.

Modified Paths:
--------------
    trunk/src/editor.c

Modified: trunk/src/editor.c
===================================================================
--- trunk/src/editor.c	2009-04-07 22:08:38 UTC (rev 3696)
+++ trunk/src/editor.c	2009-04-07 22:08:50 UTC (rev 3697)
@@ -1623,9 +1623,11 @@
 	if (! editor_prefs.auto_complete_symbols && ! force)
 		return FALSE;
 
-	g_return_val_if_fail(G_LIKELY(editor != NULL) &&
-		G_LIKELY(editor->document->file_type != NULL), FALSE);
+	g_return_val_if_fail(G_LIKELY(editor != NULL), FALSE);
 
+	if (G_UNLIKELY(editor->document->file_type != NULL))
+		return;
+
 	/* If we are at the beginning of the document, we skip autocompletion as we can't determine the
 	 * necessary styling information */
 	if (G_UNLIKELY(pos < 2))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.