all windows but the master panel are destroyed at logout

fix for issue #878, see http://bugs.campware.org/view.php?id=878
This commit is contained in:
maroy 2005-04-26 13:17:48 +00:00
parent 84523cbda1
commit d05a992551

View file

@ -21,8 +21,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Author : $Author: fgerlits $ Author : $Author: maroy $
Version : $Revision: 1.21 $ Version : $Revision: 1.22 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/MasterPanelWindow.cxx,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/MasterPanelWindow.cxx,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -301,7 +301,7 @@ MasterPanelWindow :: onUpdateTime(int dummy) throw ()
void void
MasterPanelWindow :: onUploadFileButtonClicked(void) throw () MasterPanelWindow :: onUploadFileButtonClicked(void) throw ()
{ {
if (!scratchpadWindow.get()) { if (!uploadFileWindow.get()) {
Ptr<ResourceBundle>::Ref bundle; Ptr<ResourceBundle>::Ref bundle;
try { try {
bundle = getBundle("uploadFileWindow"); bundle = getBundle("uploadFileWindow");
@ -432,20 +432,25 @@ MasterPanelWindow :: showAnonymousUI(void) throw ()
schedulerButton->hide(); schedulerButton->hide();
searchButton->hide(); searchButton->hide();
if (uploadFileWindow) { if (uploadFileWindow.get()) {
uploadFileWindow->hide(); uploadFileWindow->hide();
uploadFileWindow.reset();
} }
if (scratchpadWindow) { if (scratchpadWindow.get()) {
scratchpadWindow->hide(); scratchpadWindow->hide();
scratchpadWindow.reset();
} }
if (simplePlaylistMgmtWindow) { if (simplePlaylistMgmtWindow.get()) {
simplePlaylistMgmtWindow->hide(); simplePlaylistMgmtWindow->hide();
simplePlaylistMgmtWindow.reset();
} }
if (schedulerWindow) { if (schedulerWindow.get()) {
schedulerWindow->hide(); schedulerWindow->hide();
schedulerWindow.reset();
} }
if (searchWindow) { if (searchWindow.get()) {
searchWindow->hide(); searchWindow->hide();
searchWindow.reset();
} }
} }