From 22d00dbb820749cf9ceb1cea23d0236ea164f258 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 30 Aug 2012 20:25:46 +0000 Subject: [PATCH] Fix opening URLs in new window with recent Firefox under Windows. Don't fail if we can't replace "-1" in the WWW_OpenURL topic value stored in the registry with "0", it can be already "0" for the recent Firefox versions. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/utilswin.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/msw/utilswin.cpp b/src/msw/utilswin.cpp index eafa930389..c186e0253c 100644 --- a/src/msw/utilswin.cpp +++ b/src/msw/utilswin.cpp @@ -92,16 +92,17 @@ bool wxDoLaunchDefaultBrowser(const wxString& url, const wxString& scheme, int f if ( ok ) { // for WWW_OpenURL, the index of the window to open the URL - // in is -1 (meaning "current") by default, replace it with - // 0 which means "new" (see KB article 160957) - ok = ddeCmd.Replace(wxT("-1"), wxT("0"), - false /* only first occurrence */) == 1; - } + // in may be -1 (meaning "current") by default, replace it + // with 0 which means "new" (see KB article 160957), but + // don't fail if there is no -1 as at least for recent + // Firefox versions the default value already is 0 + ddeCmd.Replace(wxT("-1"), wxT("0"), + false /* only first occurrence */); - if ( ok ) - { // and also replace the parameters: the topic should - // contain a placeholder for the URL + // contain a placeholder for the URL and we should fail if + // we didn't find it as this would mean that we have no way + // of passing the URL to the browser ok = ddeCmd.Replace(wxT("%1"), url, false) == 1; } -- 2.45.2