FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only reopen the streams if AllocConsole succeeds.

Browse Source 
Avoid a crash with FGRun when OSG tries to use the console.
This commit is contained in:
James Turner
2016-09-02 00:05:13 +01:00
parent c1ba974538
commit 9b997ea1f7
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/debug/logstream.cxx
+5 -7
View File
@@ -232,13 +232,11 @@ public:
if (AttachConsole(ATTACH_PARENT_PROCESS) == 0) { if (AttachConsole(ATTACH_PARENT_PROCESS) == 0) {
// attach failed, don't install the callback // attach failed, don't install the callback
addStderr = false; addStderr = false;
} } else if (!isFile) {
// No - OK! now set streams to attached console
if (!isFile) { freopen("conout$", "w", stdout);
// No - OK! now set streams to attached console freopen("conout$", "w", stderr);
freopen("conout$", "w", stdout); }
freopen("conout$", "w", stderr);
}
#endif #endif
if (addStderr) { if (addStderr) {
m_callbacks.push_back(new StderrLogCallback(m_logClass, m_logPriority)); m_callbacks.push_back(new StderrLogCallback(m_logClass, m_logPriority));