Commit 4200bed6 authored by Federico Mena Quintero's avatar Federico Mena Quintero Committed by Federico Mena Quintero

Merged from gtk-2-6:

2005-02-01  Federico Mena Quintero  <federico@ximian.com>

	Merged from gtk-2-6:

	* gtk/gtkfilechooserdefault.c
	(browse_files_model_finished_loading_cb): Don't
	g_assert_not_reached() if we are in any other state.  Another code
	path may have triggered a folder reload.  Fixes #165556.
parent 224c47a9
2005-02-01 Federico Mena Quintero <federico@ximian.com>
Merged from gtk-2-6:
* gtk/gtkfilechooserdefault.c
(browse_files_model_finished_loading_cb): Don't
g_assert_not_reached() if we are in any other state. Another code
path may have triggered a folder reload. Fixes #165556.
2005-02-01 Federico Mena Quintero <federico@ximian.com>
Merged from gtk-2-6:
......
2005-02-01 Federico Mena Quintero <federico@ximian.com>
Merged from gtk-2-6:
* gtk/gtkfilechooserdefault.c
(browse_files_model_finished_loading_cb): Don't
g_assert_not_reached() if we are in any other state. Another code
path may have triggered a folder reload. Fixes #165556.
2005-02-01 Federico Mena Quintero <federico@ximian.com>
Merged from gtk-2-6:
......
2005-02-01 Federico Mena Quintero <federico@ximian.com>
Merged from gtk-2-6:
* gtk/gtkfilechooserdefault.c
(browse_files_model_finished_loading_cb): Don't
g_assert_not_reached() if we are in any other state. Another code
path may have triggered a folder reload. Fixes #165556.
2005-02-01 Federico Mena Quintero <federico@ximian.com>
Merged from gtk-2-6:
......
......@@ -4612,7 +4612,12 @@ browse_files_model_finished_loading_cb (GtkFileSystemModel *model,
/* Nothing */
}
else
g_assert_not_reached ();
{
/* We can't g_assert_not_reached(), as something other than us may have
* initiated a folder reload. See #165556.
*/
return;
}
g_assert (impl->load_timeout_id == 0);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment