Fix #553, loading rviz as an rqt_gui plugin crashes.

ros-visualization · Jan 10, 2013 · c226908 · c226908
1 parent ee575a9
commit c226908
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/rviz/ogre_helpers/ogre_logging.cpp b/src/rviz/ogre_helpers/ogre_logging.cpp
@@ -86,7 +86,11 @@ void OgreLogging::noLog()
 void OgreLogging::configureLogging()
 {
   static RosLogListener ll;
-  Ogre::LogManager* log_manager = new Ogre::LogManager::getSingletonPtr();
+  Ogre::LogManager* log_manager = Ogre::LogManager::getSingletonPtr();
+  if( log_manager == NULL )
+  {
+    log_manager = new Ogre::LogManager();
+  }
   Ogre::Log* l = log_manager->createLog( filename_.toStdString(), false, false, preference_==NoLogging );
   l->addListener( &ll );