mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-30 11:06:43 +00:00
Code Issues Releases Wiki Activity

Move cerr initialization out of 'try' block

Browse source
This commit is contained in:
Andrei Kortunov 2018-08-14 10:30:27 +04:00
parent 61b34124e2
commit 5e172ed831
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
components/debug/debugging.cpp
View file

@ -55,6 +55,14 @@ int wrapApplication(int (*innerApplication)(int argc, char *argv[]), int argc, c
std::streambuf* cout_rdbuf = std::cout.rdbuf (); std::streambuf* cout_rdbuf = std::cout.rdbuf ();
std::streambuf* cerr_rdbuf = std::cerr.rdbuf (); std::streambuf* cerr_rdbuf = std::cerr.rdbuf ();
#if !(defined(_WIN32) && defined(_DEBUG))
boost::iostreams::stream_buffer<Debug::Tee> coutsb;
boost::iostreams::stream_buffer<Debug::Tee> cerrsb;
#endif
const std::string logName = Misc::StringUtils::lowerCase(appName) + ".log";
boost::filesystem::ofstream logfile;
int ret = 0; int ret = 0;
try try
{ {
@ -67,12 +75,8 @@ int wrapApplication(int (*innerApplication)(int argc, char *argv[]), int argc, c
std::cerr.rdbuf (&sb); std::cerr.rdbuf (&sb);
#else #else
// Redirect cout and cerr to the log file // Redirect cout and cerr to the log file
const std::string logName = Misc::StringUtils::lowerCase(appName) + ".log";
boost::filesystem::ofstream logfile;
logfile.open (boost::filesystem::path(cfgMgr.getLogPath() / logName)); logfile.open (boost::filesystem::path(cfgMgr.getLogPath() / logName));
boost::iostreams::stream_buffer<Debug::Tee> coutsb;
boost::iostreams::stream_buffer<Debug::Tee> cerrsb;
std::ostream oldcout(cout_rdbuf); std::ostream oldcout(cout_rdbuf);
std::ostream oldcerr(cerr_rdbuf); std::ostream oldcerr(cerr_rdbuf);
coutsb.open (Debug::Tee(logfile, oldcout)); coutsb.open (Debug::Tee(logfile, oldcout));
@ -90,7 +94,7 @@ int wrapApplication(int (*innerApplication)(int argc, char *argv[]), int argc, c
#endif #endif
SDL_ShowSimpleMessageBox(0, (appName + ": Fatal error").c_str(), e.what(), NULL); SDL_ShowSimpleMessageBox(0, (appName + ": Fatal error").c_str(), e.what(), NULL);
Log(Debug::Error) << "ERROR: " << e.what(); Log(Debug::Error) << "Error: " << e.what();
ret = 1; ret = 1;
} }