[vlc-devel] commit: Allow SSM to be used within QT4 Open Network panel ( Marian Ďurkovič )

git version control git at videolan.org
Mon Oct 19 14:24:56 CEST 2009


vlc | branch: 1.0-bugfix | Marian Ďurkovič <md at bts.sk> | Sun Oct 18 19:43:07 2009 +0200| [2953089aba2bc11a3730fff9772265da8d6c9b79] | committer: Marian Ďurkovič 

Allow SSM to be used within QT4 Open Network panel
closes #3116 and #2498

(cherry picked from commit 1a56200781212d669ecb64e06c0e02dc7943f55f)

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

 modules/gui/qt4/components/open_panels.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp
index 6e42e43..f65d310 100644
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -592,7 +592,8 @@ void NetOpenPanel::updateMRL() {
                 mrl += addr;
             else
             {
-                mrl += qfu( "@" );
+                if( !addr.contains( "@" ) )
+                    mrl += qfu( "@" );
                 switch( addr.count( ":" ) )
                 {
                     case 0: /* DNS or IPv4 literal, no port number */




More information about the vlc-devel mailing list