Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Never pass an empty string as directory path to the filepicker.

Browse Source 
Should work around the problem as described in
http://code.google.com/p/singularity-viewer/issues/detail?id=117
This commit is contained in:
Aleric Inglewood
2011-08-05 14:53:11 +02:00
parent 7e7a238255
commit 5005f4aa1d
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
indra/newview/statemachine/aifilepicker.cpp
View File

@@ -82,7 +82,7 @@ std::string AIFilePicker::get_folder(std::string const& default_path, std::strin
{
AIAccess<context_map_type> wContextMap(sContextMap);
context_map_type::iterator iter = wContextMap->find(context);
if (iter != wContextMap->end())
if (iter != wContextMap->end() && !iter->second.empty())
{
return iter->second;
}
@@ -91,22 +91,37 @@ std::string AIFilePicker::get_folder(std::string const& default_path, std::strin
LL_DEBUGS("Plugin") << "context \"" << context << "\" not found. Returning default_path \"" << default_path << "\"." << LL_ENDL;
return default_path;
}
else if ((iter = wContextMap->find("savefile")) != wContextMap->end())
else if ((iter = wContextMap->find("savefile")) != wContextMap->end() && !iter->second.empty())
{
LL_DEBUGS("Plugin") << "context \"" << context << "\" not found and default_path empty. Returning context \"savefile\": \"" << iter->second << "\"." << LL_ENDL;
return iter->second;
}
else
{
LL_DEBUGS("Plugin") << "context \"" << context << "\" not found, default_path empty and context \"savefile\" not found. Returning \"$HOME\"." << LL_ENDL;
// This is the last resort when all else failed. Open the file chooser in directory 'home'.
char const* home = NULL;
#if LL_WINDOWS
home = getenv("HOMEPATH");
char const* envname = "HOMEPATH";
#else
home = getenv("HOME");
char const* envname = "HOME";
#endif
return home ? home : "";
char const* home = getenv(envname);
if (!home || home[0] == '\0')
{
#if LL_WINDOWS
// On windows, the filepicker window won't pop up at all if we pass an empty string.
home = "C:\\";
#else
home = "/";
#endif
LL_DEBUGS("Plugin") << "context \"" << context << "\" not found, default_path empty, context \"savefile\" not found "
"and environment variable \"$" << envname << "\" empty! Returning \"" << home << "\"." << LL_ENDL;
}
else
{
LL_DEBUGS("Plugin") << "context \"" << context << "\" not found, default_path empty and context \"savefile\" not found. "
"Returning environment variable \"$" << envname << "\" (" << home << ")." << LL_ENDL;
}
return home;
}
}