mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 12:56:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Modified destroying of WDiff widget.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2010-04-15 22:30:31 +04:00 committed by Ilia Maslakov
parent 6c3e3715f8
commit e045279dbc
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/diffviewer/ydiff.c
View File

@ -2438,6 +2438,9 @@ dview_fini (WDiff * dview)
f_close (dview->f[0]); f_close (dview->f[0]);
} }
if (dview->converter != str_cnv_from_term)
str_close_conv (dview->converter);
destroy_hdiff (dview); destroy_hdiff (dview);
g_array_foreach (dview->a[0], DIFFLN, cc_free_elt); g_array_foreach (dview->a[0], DIFFLN, cc_free_elt);
g_array_free (dview->a[0], TRUE); g_array_free (dview->a[0], TRUE);
@ -3084,6 +3087,10 @@ dview_callback (Widget * w, widget_msg_t msg, int parm)
dview_update (dview); dview_update (dview);
return i; return i;
case WIDGET_DESTROY:
dview_fini (dview);
return MSG_HANDLED;
default: default:
return default_proc (msg, parm); return default_proc (msg, parm);
} }
@ -3168,11 +3175,8 @@ diff_view (const char *file1, const char *file2, const char *label1, const char
* you have to modify dview_adjust_size to * you have to modify dview_adjust_size to
* be aware of it * be aware of it
*/ */
if (!error) if (error == 0)
{
run_dlg (dview_dlg); run_dlg (dview_dlg);
dview_fini (dview);
}
destroy_dlg (dview_dlg); destroy_dlg (dview_dlg);
return error; return error;