Fixed a condition in goto where the message window would eat itself

prior to importing the messages, forcing daphne to crash.

diff --git a/daphne/ChangeLog b/daphne/ChangeLog
index a4724216e888e96c7047b52499c2bde9362c901e..9d623806e1954ee69e79026978954e4732c655bb 100644 (file)
--- a/daphne/ChangeLog
+++ b/daphne/ChangeLog
@@ -1,4 +1,8 @@
-$Log$
+ $Log$
+ Revision 1.15  2000/01/08 20:25:21  smw
+ Fixed a condition in goto where the message window would eat itself
+ prior to importing the messages, forcing daphne to crash.
+
 Revision 1.14  2000/01/08 20:06:38  smw
 Added hosts.cpp (for user configurable bbs additions to bbslist)
 

diff --git a/daphne/roomview.cpp b/daphne/roomview.cpp
index 622ee21ffda7115a915722dd8eff377926a0d093..620e436b3894e1b71703aaa209f7b9f221e9abca 100644 (file)
--- a/daphne/roomview.cpp
+++ b/daphne/roomview.cpp
@@ -253,10 +253,12 @@ void RoomView::OnButtonPressed(wxCommandEvent& whichbutton) {
                wxMessageBox("You are not connected to a BBS.");
                return;
                } else
-               delete this;
+               /*delete this; */
                sendcmd = "SLRP HIGHEST";       // mark messages as read
                citsock->serv_trans(sendcmd, recvcmd, xferbuf, ThisRoom);
                new RoomView(citsock, citMyMDI, RoomList->GetNextRoom());
+               delete this;
+
        } else if (whichbutton.GetId() == BUTTON_ZAP) {
                if (citadel->IsConnected()==FALSE) {
                wxMessageBox("You are not connected to a BBS.");
@@ -322,6 +324,7 @@ void RoomView::do_readloop(wxString readcmd) {
        allmsgs += "</BODY></HTML>";
 
        message_window = new wxHtmlWindow(this);
+       Maximize(TRUE);
 
        wxLayoutConstraints *m1 = new wxLayoutConstraints;
        m1->top.Below(banner, 2);