any CSrmmBaseDialog descendant can refer to SESSION_INFO, not only CChatRoomDlg

2 files changed, 1 insertions, 3 deletions

diff --git a/src/core/stdmsg/src/chat_window.cpp b/src/core/stdmsg/src/chat_window.cpp
index 8af9e7db0c..b66912c87d 100644
--- a/src/core/stdmsg/src/chat_window.cpp
+++ b/src/core/stdmsg/src/chat_window.cpp
@@ -827,7 +827,6 @@ static void __cdecl phase2(void * lParam)
 
 CChatRoomDlg::CChatRoomDlg(SESSION_INFO *si) :
 	CSrmmBaseDialog(g_hInst, g_Settings.bTabsEnable ? IDD_CHANNEL_TAB : IDD_CHANNEL),
-	m_si(si),
 	m_nickList(this, IDC_LIST),
 	m_message(this, IDC_MESSAGE),
 	m_log(this, IDC_LOG),
@@ -849,6 +848,7 @@ CChatRoomDlg::CChatRoomDlg(SESSION_INFO *si) :
 	m_splitterX(this, IDC_SPLITTERX),
 	m_splitterY(this, IDC_SPLITTERY)
 {
+	m_si = si;
 	m_pLog = &m_log;
 	m_pEntry = &m_message;
 	m_hContact = si->hContact;
diff --git a/src/core/stdmsg/src/stdafx.h b/src/core/stdmsg/src/stdafx.h
index 9fe02becd0..076d743dad 100644
--- a/src/core/stdmsg/src/stdafx.h
+++ b/src/core/stdmsg/src/stdafx.h
@@ -177,8 +177,6 @@ class CChatRoomDlg : public CSrmmBaseDialog
 

 	HWND m_hwndStatus;

 

-	SESSION_INFO *m_si;

-

 	CCtrlEdit m_message, m_log;

 	CCtrlListBox m_nickList;

 	CCtrlButton m_btnOk;