[gedit] tab: set auto_save_timeout to 0 before setting the state
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit] tab: set auto_save_timeout to 0 before setting the state
- Date: Sun, 15 Jun 2014 20:05:30 +0000 (UTC)
commit 68f4c231a6f5ababce55d646b579ffac931edfc8
Author: Sébastien Wilmet <swilmet gnome org>
Date: Sun Jun 15 21:47:36 2014 +0200
tab: set auto_save_timeout to 0 before setting the state
gedit_tab_set_state() will remove the timeout, but the timeout is
already removed by returning FALSE at the end of gedit_tab_auto_save().
So it's safer to set auto_save_timeout to 0 before calling
gedit_tab_set_state().
gedit/gedit-tab.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/gedit/gedit-tab.c b/gedit/gedit-tab.c
index f154440..d7a6712 100644
--- a/gedit/gedit-tab.c
+++ b/gedit/gedit-tab.c
@@ -2153,15 +2153,15 @@ gedit_tab_auto_save (GeditTab *tab)
return FALSE;
}
+ /* Set auto_save_timeout to 0 since the timeout is going to be destroyed */
+ tab->priv->auto_save_timeout = 0;
+
gedit_tab_set_state (tab, GEDIT_TAB_STATE_SAVING);
/* uri used in error messages, will be freed in document_saved */
tab->priv->tmp_save_location = gedit_document_get_location (doc);
tab->priv->tmp_encoding = gedit_document_get_encoding (doc);
- /* Set auto_save_timeout to 0 since the timeout is going to be destroyed */
- tab->priv->auto_save_timeout = 0;
-
/* Since we are autosaving, we need to preserve the backup that was produced
the last time the user "manually" saved the file. In the case a recoverable
error happens while saving, the last backup is not preserved since the user
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]