[vlc-commits] Qt4: ask for confirmation before overwriting files with sout

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Sep  4 12:24:17 2012 +0300| [2db381f650ad54b0e87afa5a6e378bb3a00368c7] | committer: Rémi Denis-Courmont

Qt4: ask for confirmation before overwriting files with sout

Both conversion and streaming output wizard are covered.
However, demuxdump is _not_ covered.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2db381f650ad54b0e87afa5a6e378bb3a00368c7
---

 modules/gui/qt4/components/sout/sout_widgets.cpp |    1 +
 modules/gui/qt4/dialogs/convert.cpp              |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/gui/qt4/components/sout/sout_widgets.cpp b/modules/gui/qt4/components/sout/sout_widgets.cpp
index 94a0c4a..1799e94 100644
--- a/modules/gui/qt4/components/sout/sout_widgets.cpp
+++ b/modules/gui/qt4/components/sout/sout_widgets.cpp
@@ -128,6 +128,7 @@ QString FileDestBox::getMRL( const QString& mux )
         }
     }
     m.option( "dst", outputfile );
+    m.option( "no-overwrite" );
     m.end();
 
     return m.getMrl();
diff --git a/modules/gui/qt4/dialogs/convert.cpp b/modules/gui/qt4/dialogs/convert.cpp
index e04681e..0e240ff 100644
--- a/modules/gui/qt4/dialogs/convert.cpp
+++ b/modules/gui/qt4/dialogs/convert.cpp
@@ -140,7 +140,7 @@ void ConvertDialog::close()
         mrl += ":";
         if( displayBox->isChecked() )
             mrl += "duplicate{dst=display,dst=";
-        mrl += "std{access=file,mux=" + profile->getMux()
+        mrl += "std{access=file{no-overwrite},mux=" + profile->getMux()
              + ",dst='" + fileLine->text() + "'}";
         if( displayBox->isChecked() )
             mrl += "}";