SF.net SVN: geany:[3638] trunk

[eht16 at users.sourceforge.net]

Revision: 3638
          http://geany.svn.sourceforge.net/geany/?rev=3638&view=rev
Author:   eht16
Date:     2009-03-19 18:03:38 +0000 (Thu, 19 Mar 2009)

Log Message:
-----------
Reset current build directory to the base directory after reading a "Leaving directory" message when parsing Make output (closes #2694479, patch by Andrea Mazzoleni, thanks).

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-03-19 17:50:38 UTC (rev 3637)
+++ trunk/ChangeLog	2009-03-19 18:03:38 UTC (rev 3638)
@@ -5,6 +5,9 @@
    'Set Includes and Arguments' dialog.
    Disable Compile/Run buttons/menu items when Compile/Run commands are
    set but empty.
+   Reset current build directory to the base directory after reading a
+   "Leaving directory" message when parsing Make output
+   (closes #2694479, patch by Andrea Mazzoleni, thanks).
  * src/notebook.c:
    Fix wrong display of the filename in the tab bar menu for new files.
  * src/dialog.c:

Modified: trunk/src/build.c
===================================================================
--- trunk/src/build.c	2009-03-19 17:50:38 UTC (rev 3637)
+++ trunk/src/build.c	2009-03-19 18:03:38 UTC (rev 3638)
@@ -853,6 +853,12 @@
 		return TRUE;
 	}
 
+	if (strstr(string, "Leaving directory") != NULL)
+	{
+		*prefix = NULL;
+		return TRUE;
+	}
+
 	return FALSE;
 }
 


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