[Planeshift-cvs] CVS: planeshift/src/client/gui psdmngr.cpp,1.78,1.79 psdconn.cpp,1.52,1.53

[Anders R. <ma...@us...>]

Update of /cvsroot/planeshift/planeshift/src/client/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv20567/src/client/gui

Modified Files:
	psdmngr.cpp psdconn.cpp 
Log Message:
- Fix for the /guildinvite command that caused the invited client to
  disconnect. This included fixing a general problem with dialogs.
  After a confirm dialog was destroyed the next dialog in stack was
  set activ. Removed all dialogs from the connect sequence so that
  the connect dialog wasn't shown after closing the confirm dlg.


Index: psdmngr.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/psdmngr.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** psdmngr.cpp	1 Mar 2003 02:23:12 -0000	1.78
--- psdmngr.cpp	9 Mar 2003 12:22:21 -0000	1.79
***************
*** 117,120 ****
--- 117,121 ----
  {
      dialogs.DeleteAll();
+     currentDialog = NULL;
  }
  

Index: psdconn.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/psdconn.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** psdconn.cpp	1 Mar 2003 02:23:12 -0000	1.52
--- psdconn.cpp	9 Mar 2003 12:22:21 -0000	1.53
***************
*** 288,292 ****
      psDialog::DrawFrame2D();
  
!     if (connecting && csGetTicks() >= timeout)
      {
          Disconnect();
--- 288,292 ----
      psDialog::DrawFrame2D();
  
!     if (connecting && isVisible && csGetTicks() >= timeout)
      {
          Disconnect();