[vlc-commits] Qt: fix association crash on XP

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Sep 16 20:11:05 2012 +0200| [f447119e42aa353b18f8ba96ff6a52af363f8a3e] | committer: Jean-Baptiste Kempf

Qt: fix association crash on XP

Close #2246 #4424 #7431 #5377

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

 modules/gui/qt4/components/simple_preferences.cpp |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 48b7d00..e69fc58 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -1070,10 +1070,10 @@ void addAsso( QVLCRegistry *qvReg, const char *psz_ext )
 
 void delAsso( QVLCRegistry *qvReg, const char *psz_ext )
 {
-    char psz_VLC[] = "VLC";
+    QString s_path( "VLC"); s_path += psz_ext;
     char *psz_value = qvReg->ReadRegistryString( psz_ext, "", "" );
 
-    if( psz_value && !strcmp( strcat( psz_VLC, psz_ext ), psz_value ) )
+    if( psz_value && !strcmp( qtu(s_path), psz_value ) )
     {
         free( psz_value );
         psz_value = qvReg->ReadRegistryString( psz_ext, "VLC.backup", "" );
@@ -1084,6 +1084,7 @@ void delAsso( QVLCRegistry *qvReg, const char *psz_ext )
     }
     free( psz_value );
 }
+
 void SPrefsPanel::saveAsso()
 {
     QVLCRegistry * qvReg = NULL;