Attachment #77051 for bug #74831

View | Details | Raw Unified | Return to bug 74831
Collapse All | Expand All

Lines 640-645 Link Here

(-)eq-xmms-0.6.orig/src/configuration.c (+7 lines)
640	gint i,chn;	640	gint i,chn;
641	cfgfile = xmms_cfg_open_default_file();	641	cfgfile = xmms_cfg_open_default_file();
642		642
		643	if (!eqcfg.skin)
		644	eqcfg.skin = "default";
		645	if (!eqcfg.eqpreset_default_file)
		646	eqcfg.eqpreset_default_file = g_strdup("eq_dir_default.preset");
		647	if (!eqcfg.eqpreset_extension)
		648	eqcfg.eqpreset_extension = g_strdup("eq_preset");
		649
643	xmms_cfg_write_int(cfgfile, "eq_plugin", "x", eqcfg.x);	650	xmms_cfg_write_int(cfgfile, "eq_plugin", "x", eqcfg.x);
644	xmms_cfg_write_int(cfgfile, "eq_plugin", "y", eqcfg.y);	651	xmms_cfg_write_int(cfgfile, "eq_plugin", "y", eqcfg.y);
645	xmms_cfg_write_int(cfgfile, "eq_plugin", "band_num", eqcfg.band_num);	652	xmms_cfg_write_int(cfgfile, "eq_plugin", "band_num", eqcfg.band_num);

Lines 31-37 Link Here

(-)eq-xmms-0.6.orig/src/eq.c (-2 / +3 lines)
31	static gint raisevol(gpointer data);	31	static gint raisevol(gpointer data);
32	static gint monitor_song_change(gpointer data);	32	static gint monitor_song_change(gpointer data);
33	static int volume_diff;	33	static int volume_diff;
34	static guint monitor_id;	34	static guint monitor_id = 0;
35	static gint previous_pos;	35	static gint previous_pos;
36	static gchar *previous_filename;	36	static gchar *previous_filename;
37		37
Lines 75-81 Link Here
75	static void cleanup(void)	75	static void cleanup(void)
76	{	76	{
77	clean_gui();	77	clean_gui();
78	gtk_timeout_remove(monitor_id);	78	if (monitor_id)
		79	gtk_timeout_remove(monitor_id);
79	g_free(previous_filename);	80	g_free(previous_filename);
80	}	81	}
81		82




void clean_gui(void)
{
    eq_write_config();

    if (eqskinwin) {
        gtk_widget_destroy(GTK_WIDGET(eqskinwin));
        eqskinwin = NULL;
    }

    if (EQequalizerwin) {
        gtk_widget_destroy(GTK_WIDGET(EQequalizerwin));
        EQequalizerwin = NULL;
    }
    
    eq_has_been_initialized = FALSE;
}

Return to bug 74831

Lines 194-201 Link Here

(-)eq-xmms-0.6.orig/src/gui.c (-2 / +10 lines)
194	void clean_gui(void)	194	void clean_gui(void)
195	{	195	{
196	eq_write_config();	196	eq_write_config();
197	gtk_widget_destroy(GTK_WIDGET(eqskinwin));	197
198	gtk_widget_destroy(GTK_WIDGET(EQequalizerwin));	198	if (eqskinwin) {
		199	gtk_widget_destroy(GTK_WIDGET(eqskinwin));
		200	eqskinwin = NULL;
		201	}
		202
		203	if (EQequalizerwin) {
		204	gtk_widget_destroy(GTK_WIDGET(EQequalizerwin));
		205	EQequalizerwin = NULL;
		206	}
199		207
200	eq_has_been_initialized = FALSE;	208	eq_has_been_initialized = FALSE;
201	}	209	}