HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a possible segfault on quitting caused by processing GTK messages before status messages

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@487 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Nick Treleaven 2006-06-26 15:49:07 +00:00
parent 5b4f2b5280
commit add773c88c
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-06-26 Nick Treleaven <nick.treleaven@btinternet.com>
* src/document.c: Fix a possible segfault on quitting caused by
processing GTK messages before status messages.
2006-06-25 Enrico Troeger <enrico.troeger@uvena.de>
* README, doc/geany.docbook: Added license notice Scintilla.

19
src/document.c
View File

@ -525,16 +525,6 @@ int document_open_file(gint idx, const gchar *filename, gint pos, gboolean reado
utils_build_show_hide(idx);
}
// update sci to send SCN_UPDATEUI before we set status messages
while (gtk_events_pending())
gtk_main_iteration();
if (reload)
msgwin_status_add(_("File %s reloaded."), utf8_filename);
else
msgwin_status_add(_("File %s opened(%d%s)."),
utf8_filename, gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)),
(readonly) ? _(", read-only") : "");
document_set_text_changed(idx);
g_free(data);
@ -552,6 +542,15 @@ int document_open_file(gint idx, const gchar *filename, gint pos, gboolean reado
utils_update_recent_menu();
}
// currently status messages are overridden by update sci SCN_UPDATEUI message
// processing gtk messages first causes a segfault on closing & reloading utils.c
if (reload)
msgwin_status_add(_("File %s reloaded."), utf8_filename);
else
msgwin_status_add(_("File %s opened(%d%s)."),
utf8_filename, gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)),
(readonly) ? _(", read-only") : "");
g_free(utf8_filename);
g_free(locale_filename);
//gettimeofday(&tv1, &tz);