SF.net SVN: geany: [743] trunk

[ntrel at users.sourceforge.net]

Revision: 743
Author:   ntrel
Date:     2006-08-19 03:00:21 -0700 (Sat, 19 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/geany/?rev=743&view=rev

Log Message:
-----------
Fix a segfault at startup if terminal follow path setting is enabled

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/callbacks.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-08-19 09:08:48 UTC (rev 742)
+++ trunk/ChangeLog	2006-08-19 10:00:21 UTC (rev 743)
@@ -1,3 +1,9 @@
+2006-08-19  Nick Treleaven  <nick.treleaven at btinternet.com>
+
+ * src/callbacks.c: Fix a segfault at startup if terminal follow path
+                    setting is enabled.
+
+
 2006-08-18  Administrator  <Administrator at localhost>
 
  * src/document.c: Use codepage SC_CP_UTF8 because we use always

Modified: trunk/src/callbacks.c
===================================================================
--- trunk/src/callbacks.c	2006-08-19 09:08:48 UTC (rev 742)
+++ trunk/src/callbacks.c	2006-08-19 10:00:21 UTC (rev 743)
@@ -781,7 +781,9 @@
 	}
 
 #ifdef HAVE_VTE
-	if (app->have_vte && vc->follow_path && doc_list[idx].file_name != NULL)
+	// at startup, idx is always -1, so terminal startup dir is wrong,
+	// but we could remember the vte dir to fix this.
+	if (idx >= 0 && app->have_vte && vc->follow_path && doc_list[idx].file_name != NULL)
 	{
 		gchar *path;
 		gchar *cmd;


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