Skip to content

Commit b3d6361

Browse files
committed
Moved stats messages to before 'closed connection' dialog box
1 parent 1ea8ec0 commit b3d6361

File tree

1 file changed

+15
-16
lines changed

1 file changed

+15
-16
lines changed

worldsock.cpp

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -152,22 +152,6 @@ bool bWasClosed = m_pDoc->m_iConnectPhase == eConnectNotConnected;
152152
m_pDoc->StartNewLine (true, 0);
153153
} // end of message in world window wanted
154154

155-
CString str;
156-
157-
str = TFormat ("The \"%s\" server has closed the connection",
158-
(const char *) m_pDoc->m_mush_name);
159-
160-
if (App.m_bNotifyOnDisconnect && !m_pDoc->m_bDisconnectOK)
161-
{
162-
if (App.m_bErrorNotificationToOutputWindow)
163-
m_pDoc->Note (str);
164-
else
165-
::UMessageBox (str, MB_ICONEXCLAMATION);
166-
}
167-
else
168-
Frame.SetStatusMessage (str);
169-
m_pDoc->m_iConnectPhase = eConnectNotConnected;
170-
171155
CString strInfo = TFormat ("Received %i line%s, sent %i line%s.",
172156
PLURAL (m_pDoc->m_nTotalLinesReceived),
173157
PLURAL (m_pDoc->m_nTotalLinesSent)
@@ -190,6 +174,21 @@ CString str;
190174

191175
m_pDoc->Note (strInfo);
192176

177+
CString str;
178+
179+
str = TFormat ("The \"%s\" server has closed the connection",
180+
(const char *) m_pDoc->m_mush_name);
181+
182+
if (App.m_bNotifyOnDisconnect && !m_pDoc->m_bDisconnectOK)
183+
{
184+
if (App.m_bErrorNotificationToOutputWindow)
185+
m_pDoc->Note (str);
186+
else
187+
::UMessageBox (str, MB_ICONEXCLAMATION);
188+
}
189+
else
190+
Frame.SetStatusMessage (str);
191+
m_pDoc->m_iConnectPhase = eConnectNotConnected;
193192

194193
} // end of OnClose
195194

0 commit comments

Comments
 (0)