Skip to content

Commit 7a8d2f0

Browse files
author
hpcdgrie
committed
Renamed COVISE_TERMINATE_ON_QUIT to COVER_TERMINATE_SESSION because it also affects Vistle. If set terminating COVER will also terminate COVISE or Vistle.
1 parent bd95dbd commit 7a8d2f0

6 files changed

Lines changed: 6 additions & 8 deletions

File tree

bin/crimeDemo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
export COVISE_TERMINATE_ON_QUIT=1 # terminate covise session when COVER exits
3+
export COVER_TERMINATE_SESSION=1 # terminate covise session when COVER exits
44

55
MENU='\033[00;00m' # white
66
OPT='\033[32m' # green

bin/csiDemo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
export COVISE_TERMINATE_ON_QUIT=1 # terminate covise session when COVER exits
3+
export COVER_TERMINATE_SESSION=1 # terminate covise session when COVER exits
44

55
MENU='\033[00;00m' # white
66
OPT='\033[32m' # green

bin/hlrsDemo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
export COVISE_TERMINATE_ON_QUIT=1 # terminate covise session when COVER exits
3+
export COVER_TERMINATE_SESSION=1 # terminate covise session when COVER exits
44

55
# some day there will be ansii color
66
#LSCOLORS=exfxcxdxbxegedabagacad

src/OpenCOVER/cover/OpenCOVER.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1535,7 +1535,7 @@ OpenCOVER::requestQuit()
15351535
{
15361536
setExitFlag(true);
15371537
bool terminateOnCoverQuit = coCoviseConfig::isOn("COVER.TerminateCoviseOnQuit", false);
1538-
if (getenv("COVISE_TERMINATE_ON_QUIT"))
1538+
if (getenv("COVER_TERMINATE_SESSION"))
15391539
{
15401540
terminateOnCoverQuit = true;
15411541
}

src/VIVE/core/vvVIVE.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1317,7 +1317,7 @@ vvVIVE::requestQuit()
13171317
{
13181318
setExitFlag(true);
13191319
bool terminateOnCoverQuit = coCoviseConfig::isOn("VIVE.TerminateCoviseOnQuit", false);
1320-
if (getenv("COVISE_TERMINATE_ON_QUIT"))
1320+
if (getenv("COVER_TERMINATE_SESSION"))
13211321
{
13221322
terminateOnCoverQuit = true;
13231323
}

src/sys/controller/handler.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@ void CTRLHandler::handleQuit(const std::unique_ptr<Message> &msg)
787787
if (msg->send_type == RENDERER)
788788
{
789789
bool terminateOnCoverQuit = coCoviseConfig::isOn("COVER.TerminateCoviseOnQuit", false);
790-
if (getenv("COVISE_TERMINATE_ON_QUIT"))
790+
if (getenv("COVER_TERMINATE_SESSION"))
791791
{
792792
terminateOnCoverQuit = true;
793793
}
@@ -799,8 +799,6 @@ void CTRLHandler::handleQuit(const std::unique_ptr<Message> &msg)
799799
if (auto renderer = dynamic_cast<const Renderer *>(mod))
800800
{
801801
const string &name = renderer->info().name;
802-
803-
if (name == "VRRenderer" || name == "OpenCOVER" || name == "COVER" || name == "COVER_VRML")
804802
terminateForCover = true;
805803
}
806804
}

0 commit comments

Comments
 (0)