From 2748e34f27b2716e647163e3e72757f4394e8f32 Mon Sep 17 00:00:00 2001 From: sfb Date: Tue, 7 Dec 2010 09:07:28 -0600 Subject: [PATCH] Changed: Fixed non-PIC context initialization check in OVQT example plugin. --- .../tools/3d/object_viewer_qt/src/plugins/example/plugin1.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/example/plugin1.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/example/plugin1.cpp index 682f6c262..3abb29ca5 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/example/plugin1.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/example/plugin1.cpp @@ -52,7 +52,11 @@ void MyPlugin::execMessageBox() void MyPlugin::setNelContext(NLMISC::INelContext *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 // NL_OS_WINDOWS _LibContext = new NLMISC::CLibraryContext(*nelContext); }