SF.net SVN: geany: [2421] trunk

[ntrel at users.sourceforge.net]

Revision: 2421
          http://geany.svn.sourceforge.net/geany/?rev=2421&view=rev
Author:   ntrel
Date:     2008-03-27 06:23:09 -0700 (Thu, 27 Mar 2008)

Log Message:
-----------
Fix getting asked whether to reload a file twice, when a disk check
is forced immediately after a disk check has been done.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-03-27 13:19:39 UTC (rev 2420)
+++ trunk/ChangeLog	2008-03-27 13:23:09 UTC (rev 2421)
@@ -5,6 +5,9 @@
  * src/plugindata.h:
    Document most of GeanyData, add links to files.
    Make PluginData alias deprecated.
+ * src/utils.c:
+   Fix getting asked whether to reload a file twice, when a disk check
+   is forced immediately after a disk check has been done.
 
 
 2008-03-26  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/src/utils.c
===================================================================
--- trunk/src/utils.c	2008-03-27 13:19:39 UTC (rev 2420)
+++ trunk/src/utils.c	2008-03-27 13:23:09 UTC (rev 2421)
@@ -378,8 +378,8 @@
 	{
 		if (check_reload(idx))
 		{
-			/* Disable checking until after reload */
-			doc_list[idx].last_check = time(NULL) + delay_time;
+			/* Disable checking until after reload, so ignore this change for now */
+			doc_list[idx].mtime = st.st_mtime;
 		}
 		else
 			doc_list[idx].mtime = st.st_mtime;	/* Ignore this change on disk completely */


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