SF.net SVN: geany: [2640] trunk

[eht16 at users.sourceforge.net]

Revision: 2640
          http://geany.svn.sourceforge.net/geany/?rev=2640&view=rev
Author:   eht16
Date:     2008-06-04 06:23:43 -0700 (Wed, 04 Jun 2008)

Log Message:
-----------
Restore the previous state of main_status.quitting status when asking for reload a changed file instead of setting it to true. Oops.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-06-03 18:15:52 UTC (rev 2639)
+++ trunk/ChangeLog	2008-06-04 13:23:43 UTC (rev 2640)
@@ -1,3 +1,10 @@
+2008-06-04  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/dialogs.c:
+   Restore the previous state of main_status.quitting status when asking
+   for reload a changed file instead of setting it to true.
+
+
 2008-06-03  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * src/build.c, src/dialogs.c, src/document.c, src/document.h,

Modified: trunk/src/dialogs.c
===================================================================
--- trunk/src/dialogs.c	2008-06-03 18:15:52 UTC (rev 2639)
+++ trunk/src/dialogs.c	2008-06-04 13:23:43 UTC (rev 2640)
@@ -667,12 +667,13 @@
 #endif
 	gchar *msg, *msg2, *short_fn = NULL;
 	gint ret;
+	gboolean old_quitting_state = main_status.quitting;
 
 	/* display the file tab to remind the user of the document */
 	main_status.quitting = FALSE;
 	gtk_notebook_set_current_page(GTK_NOTEBOOK(main_widgets.notebook),
 		document_get_notebook_page(idx));
-	main_status.quitting = TRUE;
+	main_status.quitting = old_quitting_state;
 
 	if (documents[idx]->file_name != NULL)
 	{


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