SF.net SVN: geany:[5167] trunk

[ntrel at users.sourceforge.net]

Revision: 5167
          http://geany.svn.sourceforge.net/geany/?rev=5167&view=rev
Author:   ntrel
Date:     2010-08-16 12:21:22 +0000 (Mon, 16 Aug 2010)

Log Message:
-----------
Fix segfault on Tools->Reload Configuration when no documents are
open (#3037079).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/filetypes.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-08-16 11:47:50 UTC (rev 5166)
+++ trunk/ChangeLog	2010-08-16 12:21:22 UTC (rev 5167)
@@ -1,3 +1,10 @@
+2010-08-16  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/filetypes.c:
+   Fix segfault on Tools->Reload Configuration when no documents are
+   open (#3037079).
+
+
 2010-08-15  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * wscript:

Modified: trunk/src/filetypes.c
===================================================================
--- trunk/src/filetypes.c	2010-08-16 11:47:50 UTC (rev 5166)
+++ trunk/src/filetypes.c	2010-08-16 12:21:22 UTC (rev 5167)
@@ -1659,8 +1659,12 @@
 		/* filetypes_load_config() will skip not loaded filetypes */
 		filetypes_load_config(i, TRUE);
 	}
+
+	current_doc = document_get_current();
+	if (!current_doc)
+		return;
+
 	/* update document styling */
-	current_doc = document_get_current();
 	foreach_document(i)
 	{
 		if (current_doc != documents[i])


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