Commit 4c474c29 authored by js9's avatar js9
Browse files

merge from 2.0RC: fix to host profile window


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@10149 18c085ea-50e0-402c-830e-de6fd14e8384
parent e3569335
...@@ -234,6 +234,11 @@ ViewerHostProfileSelectorWithWin::~ViewerHostProfileSelectorWithWin() ...@@ -234,6 +234,11 @@ ViewerHostProfileSelectorWithWin::~ViewerHostProfileSelectorWithWin()
// Jeremy Meredith, Fri Feb 26 18:14:55 EST 2010 // Jeremy Meredith, Fri Feb 26 18:14:55 EST 2010
// Don't forget to block signals when you mess with the list. // Don't forget to block signals when you mess with the list.
// //
// Jeremy Meredith, Fri Mar 5 14:19:21 EST 2010
// Actually, we don't want to block signals, as this sets up the
// window correctly the first time. Just don't set it to a bad
// index before you set it to the right one.
//
// **************************************************************************** // ****************************************************************************
bool bool
...@@ -306,14 +311,17 @@ ViewerHostProfileSelectorWithWin::SelectProfile( ...@@ -306,14 +311,17 @@ ViewerHostProfileSelectorWithWin::SelectProfile(
{ {
profiles->addItem(profile.GetLaunchProfiles(i).GetProfileName().c_str()); profiles->addItem(profile.GetLaunchProfiles(i).GetProfileName().c_str());
} }
profiles->setCurrentRow(0); profiles->blockSignals(false);
if (profile.GetActiveProfile()>=0 && if (profile.GetActiveProfile()>=0 &&
profile.GetActiveProfile()<profile.GetNumLaunchProfiles()) profile.GetActiveProfile()<profile.GetNumLaunchProfiles())
{ {
// this signals the callback to set the default profile // this signals the callback to set the default profile
profiles->setCurrentRow(profile.GetActiveProfile()); profiles->setCurrentRow(profile.GetActiveProfile());
} }
profiles->blockSignals(false); else
{
profiles->setCurrentRow(0);
}
viewerSubject->BlockSocketSignals(true); viewerSubject->BlockSocketSignals(true);
waitingOnUser = true; waitingOnUser = true;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment