From a1fb2c502ac4f409728abc5be9ec3975d6091aec Mon Sep 17 00:00:00 2001 From: sfb Date: Tue, 7 Dec 2010 10:22:25 -0600 Subject: [PATCH] Changed: Fixed the context initialization check for the log plugin --- .../3d/object_viewer_qt/src/plugins/log/log_plugin.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_plugin.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_plugin.cpp index 601db3c73..d44124465 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_plugin.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_plugin.cpp @@ -90,11 +90,15 @@ void CLogPlugin::extensionsInitialized() void CLogPlugin::setNelContext(NLMISC::INelContext *nelContext) { - nlassert(!NLMISC::INelContext::isContextInitialised()); - _LibContext = new NLMISC::CLibraryContext(*nelContext); +#ifdef NL_OS_WINDOWS + // Ensure that a context doesn't exist yet. + // This only applies to platforms without PIC, e.g. Windows. + nlassert(!NLMISC::INelContext::isContextInitialised()); +#endif // fdef NL_OS_WINDOWS^M + _LibContext = new NLMISC::CLibraryContext(*nelContext); _displayer = new NLQT::CQtDisplayer(_ui.plainTextEdit); - + } QString CLogPlugin::name() const