debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't switch panels while destroying

Browse source 
Fixes: https://bugs.launchpad.net/midori/+bug/819688
This commit is contained in:
André Stösel 2011-09-05 18:02:42 +02:00 committed by Christian Dywan
parent 6a8b4ae60c
commit ec92c64dff
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
midori/midori-panel.c
View file

@ -13,6 +13,8 @@
#include "midori-view.h" #include "midori-view.h"
#include "midori-browser.h"
#include "marshal.h" #include "marshal.h"
#include "sokoke.h" #include "sokoke.h"
@ -588,6 +590,7 @@ static void
midori_panel_viewable_destroy_cb (GtkWidget* viewable, midori_panel_viewable_destroy_cb (GtkWidget* viewable,
MidoriPanel* panel) MidoriPanel* panel)
{ {
MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (panel));
gint n_pages; gint n_pages;
gchar* action_name; gchar* action_name;
GtkAction* action; GtkAction* action;
@ -601,7 +604,7 @@ midori_panel_viewable_destroy_cb (GtkWidget* viewable,
viewable, midori_panel_viewable_destroy_cb, panel); viewable, midori_panel_viewable_destroy_cb, panel);
n_pages = midori_panel_get_n_pages (panel); n_pages = midori_panel_get_n_pages (panel);
if (n_pages > 0) if (n_pages > 0 && browser && !g_object_get_data (G_OBJECT (browser), "midori-browser-destroyed"))
midori_panel_set_current_page (panel, (n_pages-1 > i) ? i : n_pages - 1); midori_panel_set_current_page (panel, (n_pages-1 > i) ? i : n_pages - 1);
action_name = g_strconcat ("PanelPage", action_name = g_strconcat ("PanelPage",