Text archives Help
- From: bigler@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [MANTA] r1280 - trunk/UserInterface
- Date: Fri, 2 Feb 2007 17:19:09 -0700 (MST)
Author: bigler
Date: Fri Feb 2 17:19:08 2007
New Revision: 1280
Modified:
trunk/UserInterface/XWindowUI.cc
trunk/UserInterface/XWindowUI.h
Log:
Moved the quitting variable from static local variable to class local
variable. This allows me to restart and stop Manta many times from an
external program.
Modified: trunk/UserInterface/XWindowUI.cc
==============================================================================
--- trunk/UserInterface/XWindowUI.cc (original)
+++ trunk/UserInterface/XWindowUI.cc Fri Feb 2 17:19:08 2007
@@ -68,7 +68,8 @@
XWindowUI::XWindowUI(const vector<string>& args, MantaInterface
*rtrt_interface)
: rtrt_interface(rtrt_interface), xlock("XWindowUI display lock"),
- xsema("XWindowUI semaphore", 0), path( 0 )
+ xsema("XWindowUI semaphore", 0), path( 0 ),
+ quitting(false)
{
bool quit=false;
int max_count=0;
@@ -552,7 +553,6 @@
void XWindowUI::quitkey(unsigned int, unsigned long, int)
{
- static bool quitting = false;
if(quitting){
// Pressed twice, do a faster shutdown
cerr << "Fast quit\n";
Modified: trunk/UserInterface/XWindowUI.h
==============================================================================
--- trunk/UserInterface/XWindowUI.h (original)
+++ trunk/UserInterface/XWindowUI.h Fri Feb 2 17:19:08 2007
@@ -150,6 +150,7 @@
Real rotate_speed;
Real autoview_fov;
Real trackball_radius;
+ bool quitting;
XWindowUI(const XWindowUI&);
XWindowUI& operator=(const XWindowUI&);
- [MANTA] r1280 - trunk/UserInterface, bigler, 02/02/2007
Archive powered by MHonArc 2.6.16.