[vlc-commits] qt: do not resolve symbolic link (fixes #17924)
Rémi Denis-Courmont
git at videolan.org
Tue Jan 31 17:12:04 CET 2017
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Jan 31 18:08:51 2017 +0200| [4c2c032958ddc5e7a9c3694b67fdb5e84b0ea1ec] | committer: Rémi Denis-Courmont
qt: do not resolve symbolic link (fixes #17924)
Symbolic links should be resolved when the media is opened, not when it
is added to the playlist - that is how it worked before. With that said,
VLC does not currently have code to parse Windows symbolic links, but
that is not an issue on other operationg systems.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4c2c032958ddc5e7a9c3694b67fdb5e84b0ea1ec
---
modules/gui/qt/main_interface.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/modules/gui/qt/main_interface.cpp b/modules/gui/qt/main_interface.cpp
index 4c1c459..55046e3 100644
--- a/modules/gui/qt/main_interface.cpp
+++ b/modules/gui/qt/main_interface.cpp
@@ -58,7 +58,9 @@
#include <QStatusBar>
#include <QLabel>
#include <QStackedWidget>
+#ifdef _WIN32
#include <QFileInfo>
+#endif
#include <QTimer>
@@ -1449,6 +1451,7 @@ void MainInterface::dropEventPlay( QDropEvent *event, bool b_play, bool b_playli
if( url.isValid() )
{
QString mrl = toURI( url.toEncoded().constData() );
+#ifdef _WIN32
QFileInfo info( url.toLocalFile() );
if( info.exists() && info.isSymLink() )
{
@@ -1464,6 +1467,7 @@ void MainInterface::dropEventPlay( QDropEvent *event, bool b_play, bool b_playli
}
mrl = toURI( url.toEncoded().constData() );
}
+#endif
if( mrl.length() > 0 )
{
Open::openMRL( p_intf, mrl, first, b_playlist );
More information about the vlc-commits
mailing list