Navigation

Changeset 6eb31e1ae810d9be2c70a0eb265117806c9db882

Timestamp:

02/10/08 11:46:02 (7 months ago)

Author:

Jean-Baptiste Kempf <jb@videolan.org>

git-committer:

Jean-Baptiste Kempf <jb@videolan.org> 1202640362 +0000

git-parent:

[0ba856895367653b71198c8b7b543f628c0ae236]

git-author:

Jean-Baptiste Kempf <jb@videolan.org> 1202640362 +0000

Message:

Qt4 - Destroy correctly the qt4 interface when used in DP.

Files:

r0ba8568	r6eb31e1
249	249	vlc_mutex_unlock( &p_intf->object_lock );
250	250
251		if( p_intf->pf_show_dialog )
252		{
	251	if( p_intf->p_sys->b_isDialogProvider )
	252	{
	253	DialogEvent *event = new DialogEvent( INTF_DIALOG_EXIT, 0, NULL );
	254	QApplication::postEvent( THEDP, static_cast<QEvent*>(event) );
	255
253	256	vlc_thread_join( p_intf );
254	257	}
…	…
310	313	/* We don't show it because it is done in the MainInterface constructor
311	314	p_mi->show(); */
	315	p_intf->p_sys->b_isDialogProvider = false;
312	316	}
313	317	else
314	318	{
315	319	vlc_thread_ready( p_intf );
	320	p_intf->p_sys->b_isDialogProvider = true;
316	321	}
317	322
…	…
343	348
344	349	/* Explain to the core how to show a dialog :D */
345		//p_intf->pf_show_dialog = ShowDialog;
	350	p_intf->pf_show_dialog = ShowDialog;
346	351
347	352	/* Last settings */
…	…
358	363	int interval = config_GetInt( p_intf, "qt-updates-days" );
359	364	QSettings settings( "vlc", "vlc-qt-interface" );
360		if( QDate::currentDate() > settings.value( "updatedate" ).toDate().addDays( interval ) )
	365	if( QDate::currentDate() >
	366	settings.value( "updatedate" ).toDate().addDays( interval ) )
361	367	{
362	368	msg_Dbg( p_intf, "Someone said I need to check updates" );
…	…
388	394	config_PutPsz( p_intf, "qt-filedialog-path", p_intf->p_sys->psz_filepath );
389	395	free( psz_path );
390
391	396	}
392	397