Skip to content

V
vlc-2-2
Commit f447119e authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Qt: fix association crash on XP 

Close #2246 #4424 #7431 #5377
parent f2d861c7
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
modules/gui/qt4/components/simple_preferences.cpp
View file @ f447119e
...@@ -1070,10 +1070,10 @@ void addAsso( QVLCRegistry *qvReg, const char *psz_ext ) ...@@ -1070,10 +1070,10 @@ void addAsso( QVLCRegistry *qvReg, const char *psz_ext )
void delAsso( 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, "", "" ); 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 ); free( psz_value );
psz_value = qvReg->ReadRegistryString( psz_ext, "VLC.backup", "" ); psz_value = qvReg->ReadRegistryString( psz_ext, "VLC.backup", "" );
...@@ -1084,6 +1084,7 @@ void delAsso( QVLCRegistry *qvReg, const char *psz_ext ) ...@@ -1084,6 +1084,7 @@ void delAsso( QVLCRegistry *qvReg, const char *psz_ext )
} }
free( psz_value ); free( psz_value );
} }
void SPrefsPanel::saveAsso() void SPrefsPanel::saveAsso()
{ {
QVLCRegistry * qvReg = NULL; QVLCRegistry * qvReg = NULL;
......
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