fixed merge conflict in world.cpp

roamlab · Jun 28, 2016 · d3439b3 · d3439b3
2 parents cfb0fe7 + aaf8753
commit d3439b3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/graspitCore.cpp b/src/graspitCore.cpp
@@ -209,7 +209,10 @@ GraspitCore::GraspitCore(int argc, char **argv):
           ++errorFlag;
       }
       else{
-          mainWindow->mUI->worldBox->setTitle(filename);
+          if(!headless)
+          {
+              mainWindow->mUI->worldBox->setTitle(filename);
+          }
       }
   }
 

diff --git a/src/world.cpp b/src/world.cpp
@@ -861,9 +861,10 @@ World::save(const QString &filename)
 			}
 		}
 	}
-	stream<<"\t<camera>"<<endl;
-	float px, py, pz, q1, q2, q3, q4, fd;
+
+    stream<<"\t<camera>"<<endl;
 	if (myIVmgr) {
+        float px, py, pz, q1, q2, q3, q4, fd;
 		myIVmgr->getCamera(px, py, pz, q1, q2, q3, q4, fd);
 		stream<<"\t\t<position>"<<px<<" "<<py<<" "<<pz<<"</position>"<<endl;
 		stream<<"\t\t<orientation>"<<q1<<" "<<q2<<" "<<q3<<" "<<q4<<"</orientation>"<<endl;