Fix segfault when closing window from WM.

I had thought it was a timing problem, but Johannes saw that there
was a problem when the first tab in the window had already been
closed earlier.

2 files changed, 3 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 06ce7443..20a90708 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ dillo-2.2.1 [not released yet]
 +- Include Accept header in HTTP queries.
  - Don't use obsolete png_check_sig().
  - Handle zero-width space.
+ - Fix segfault closing window from WM.
    Patches: corvid
 
 -----------------------------------------------------------------------------
diff --git a/src/uicmd.cc b/src/uicmd.cc
index b57e456f..bc0eb47c 100644
--- a/src/uicmd.cc
+++ b/src/uicmd.cc
@@ -357,10 +357,9 @@ public:
 //----------------------------------------------------------------------------
 
 static void win_cb (fltk::Widget *w, void *cb_data) {
-   CustTabGroup *tabs;
    int choice = 0;
+   CustTabGroup *tabs = (CustTabGroup*) cb_data;
 
-   tabs = BW2UI((BrowserWindow*) cb_data)->tabs();
    if (tabs->children () > 1)
       choice = a_Dialog_choice3 ("Window contains more than one tab.",
                                  "Close all tabs", "Cancel", NULL);
@@ -470,7 +469,7 @@ BrowserWindow *a_UIcmd_browser_window_new(int ww, int wh,
    // Copy the layout pointer into the bw data
    new_bw->render_layout = (void*)layout;
 
-   win->callback(win_cb, new_bw);
+   win->callback(win_cb, DilloTabs);
 
    new_ui->focus_location();