X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f524b09335213d4e41636bdb9c9dc9857f996393..23318a5358be74727fb62854f623da84a4545bcd:/src/common/utilscmn.cpp?ds=sidebyside

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index c439d22484..a498ce07e6 100644
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -1024,8 +1024,11 @@ static bool DoLaunchDefaultBrowser(const wxString& urlOrig, int flags)
                 // we only know the syntax of WWW_OpenURL DDE request for IE,
                 // optimistically assume that all other browsers are compatible
                 // with it
+                static const wxChar *TOPIC_OPEN_URL = wxT("WWW_OpenURL");
+                wxString ddeCmd;
                 wxRegKey keyTopic(keyDDE, wxT("topic"));
-                bool ok = keyTopic.Exists() && keyTopic == wxT("WWW_OpenURL");
+                bool ok = keyTopic.Exists() &&
+                            keyTopic.QueryDefaultValue() == TOPIC_OPEN_URL;
                 if ( ok )
                 {
                     ddeCmd = keyDDE.QueryDefaultValue();
@@ -1038,7 +1041,7 @@ static bool DoLaunchDefaultBrowser(const wxString& urlOrig, int flags)
                     // 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 occurence */) == 1;
+                                        false /* only first occurrence */) == 1;
                 }
 
                 if ( ok )
@@ -1054,7 +1057,7 @@ static bool DoLaunchDefaultBrowser(const wxString& urlOrig, int flags)
                     wxLogNull noLog;
 
                     const wxString ddeServer = wxRegKey(keyDDE, wxT("application"));
-                    if ( wxExecuteDDE(ddeServer, ddeTopic, ddeCmd) )
+                    if ( wxExecuteDDE(ddeServer, TOPIC_OPEN_URL, ddeCmd) )
                         return true;
 
                     // this is not necessarily an error: maybe browser is