Skip to content
Snippets Groups Projects
Commit bb757b93 authored by Nat Goodspeed's avatar Nat Goodspeed
Browse files

SL-820: gDirUtilp is never nullptr.

It might point to an uninitialized LLDir, but that's a whole separate problem,
one that wouldn't be detected by checking for nullptr. If we hit that, time to
change to an LLSingleton.
parent 24e71a45
Branches
Tags
No related merge requests found
...@@ -565,12 +565,6 @@ bool LLAppViewerWin32::init() ...@@ -565,12 +565,6 @@ bool LLAppViewerWin32::init()
#else // LL_BUGSPLAT #else // LL_BUGSPLAT
if (! gDirUtilp)
{
LL_WARNS() << "Can't initialize BugSplat, gDirUtilp not yet set" << LL_ENDL;
}
else
{
std::string build_data_fname( std::string build_data_fname(
gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "build_data.json")); gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "build_data.json"));
std::ifstream inf(build_data_fname.c_str()); std::ifstream inf(build_data_fname.c_str());
...@@ -619,7 +613,6 @@ bool LLAppViewerWin32::init() ...@@ -619,7 +613,6 @@ bool LLAppViewerWin32::init()
} // got BugSplat_DB } // got BugSplat_DB
} // parsed build_data.json } // parsed build_data.json
} // opened build_data.json } // opened build_data.json
} // gDirUtilp set
#endif // LL_BUGSPLAT #endif // LL_BUGSPLAT
#endif // LL_SEND_CRASH_REPORTS #endif // LL_SEND_CRASH_REPORTS
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment