Commit 6b7e4a81 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt: correctly handle cancelling of sout/convert dialogs. Update copyrights.

parent 9544d246
/*****************************************************************************
* profile_selector.cpp : A small profile selector and editor
****************************************************************************
* Copyright (C) 2009 the VideoLAN team
* Copyright (C) 2007-2009 the VideoLAN team
* Copyright (C) 2007 Société des arts technologiques
* Copyright (C) 2007 Savoir-faire Linux
* $Id$
*
* Authors: Jean-Baptiste Kempf <jb@videolan.org>
* Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......
......@@ -112,7 +112,7 @@ void ConvertDialog::fileBrowse()
void ConvertDialog::cancel()
{
hide();
reject();
}
void ConvertDialog::close()
......@@ -131,4 +131,5 @@ void ConvertDialog::close()
",dst='" + fileLine->text() + "'}";
msg_Dbg( p_intf, "Transcode MRL: %s", qtu( mrl ) );
accept();
}
/*****************************************************************************
* sout.cpp : Stream output dialog ( old-style )
****************************************************************************
* Copyright (C) 2007-2008 the VideoLAN team
* Copyright (C) 2007 Société des arts technologiques
* Copyright (C) 2007 Savoir-faire Linux
* Copyright (C) 2007-2009 the VideoLAN team
*
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
* Jean-Baptiste Kempf <jb@videolan.org>
* Jean-François Massol <jf.massol -at- gmail.com>
* Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......
......@@ -574,14 +574,29 @@ void DialogsProvider::streamingDialog( QWidget *parent, QString mrl,
{
SoutDialog *s = SoutDialog::getInstance( parent, p_intf, mrl );
if( s->exec() == QDialog::Accepted )
psz_option = qtu( s->getMrl() );
}else {
{
psz_option = strdup( qtu( s->getMrl() ) );
delete s;
}
else
{
delete s;
return;
}
} else {
ConvertDialog *s = new ConvertDialog( parent, p_intf, mrl );
if( s->exec() == QDialog::Accepted )
psz_option = qtu( s->getMrl() );
{
psz_option = strdup( qtu( s->getMrl() ) );
delete s;
}
else
{
delete s;
return;
}
}
if( !EMPTY_STR( psz_option ) )
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment