[ 1587248 ] Segfault w/o Session Manager (e.g. KDE/GNOME ...)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2006-10-30 14:46:17 +00:00
parent 4b3d5ef316
commit cb1bf05260

View File

@@ -304,6 +304,8 @@ static wxString GetSM()
0 /* mask */, NULL /* callbacks */, 0 /* mask */, NULL /* callbacks */,
NULL, &client_id_ret, 0, NULL); NULL, &client_id_ret, 0, NULL);
if (smc_conn)
{
vendor = SmcVendor(smc_conn); vendor = SmcVendor(smc_conn);
wxString ret = wxString::FromAscii( vendor ); wxString ret = wxString::FromAscii( vendor );
free(vendor); free(vendor);
@@ -315,6 +317,9 @@ static wxString GetSM()
return ret; return ret;
} }
return wxEmptyString;
}
#endif #endif
wxString wxGUIAppTraits::GetDesktopEnvironment() const wxString wxGUIAppTraits::GetDesktopEnvironment() const