ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winemenubuilder: Don't treat empty string as a valid icon file name.

This commit is contained in:
Per Johansson 2012-09-19 21:48:16 +02:00 committed by Alexandre Julliard
parent 43950079bb
commit b8ee44581e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
programs/winemenubuilder/winemenubuilder.c
View File

@ -2978,6 +2978,7 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link
PROPSPEC ps[2];
PROPVARIANT pv[2];
char *start_path = NULL;
BOOL has_icon = FALSE;
if ( !link )
{
@ -3041,8 +3042,9 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link
hr = IPropertyStorage_ReadMultiple(pPropStg, 2, ps, pv);
if (SUCCEEDED(hr))
{
if (pv[0].vt == VT_LPWSTR && pv[0].u.pwszVal)
if (pv[0].vt == VT_LPWSTR && pv[0].u.pwszVal && pv[0].u.pwszVal[0])
{
has_icon = TRUE;
icon_name = extract_icon( pv[0].u.pwszVal, pv[1].u.iVal, NULL, bWait );
WINE_TRACE("URL icon path: %s icon index: %d icon name: %s\n", wine_dbgstr_w(pv[0].u.pwszVal), pv[1].u.iVal, icon_name);
@ -3056,7 +3058,7 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link
}
/* fail - try once again after parent process exit */
if( !icon_name )
if( has_icon && !icon_name )
{
if (bWait)
{