diff options
| author | Pierre Ossman <ossman@cendio.se> | 2015-03-03 16:37:43 +0100 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2015-03-03 16:37:43 +0100 |
| commit | b1cd6ca8f0c6c77ec66cba47004137297ae020d6 (patch) | |
| tree | 7d5925abbe571b52ab326e5eb1f3eba3586c4294 /win/winvnc | |
| parent | 615a0f58f17d46fe861f753418bfa78ae19bce89 (diff) | |
| download | tigervnc-b1cd6ca8f0c6c77ec66cba47004137297ae020d6.tar.gz tigervnc-b1cd6ca8f0c6c77ec66cba47004137297ae020d6.zip | |
Reorder class initialiser list to match what actually happens
Diffstat (limited to 'win/winvnc')
| -rw-r--r-- | win/winvnc/STrayIcon.cxx | 11 | ||||
| -rw-r--r-- | win/winvnc/VNCServerWin32.cxx | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/win/winvnc/STrayIcon.cxx b/win/winvnc/STrayIcon.cxx index 84575bd0..b13f3f19 100644 --- a/win/winvnc/STrayIcon.cxx +++ b/win/winvnc/STrayIcon.cxx @@ -63,9 +63,9 @@ namespace winvnc { class STrayIcon : public TrayIcon { public: - STrayIcon(STrayIconThread& t) : thread(t), + STrayIcon(STrayIconThread& t) : vncConfig(_T("vncconfig.exe"), isServiceProcess() ? _T("-noconsole -service") : _T("-noconsole")), - vncConnect(_T("winvnc4.exe"), _T("-noconsole -connect")) { + vncConnect(_T("winvnc4.exe"), _T("-noconsole -connect")), thread(t) { // *** SetWindowText(getHandle(), _T("winvnc::IPC_Interface")); @@ -231,9 +231,10 @@ protected: STrayIconThread::STrayIconThread(VNCServerWin32& sm, UINT inactiveIcon_, UINT activeIcon_, UINT dis_inactiveIcon_, UINT dis_activeIcon_, UINT menu_) -: Thread("TrayIcon"), server(sm), inactiveIcon(inactiveIcon_), activeIcon(activeIcon_), - dis_inactiveIcon(dis_inactiveIcon_), dis_activeIcon(dis_activeIcon_),menu(menu_), - windowHandle(0), runTrayIcon(true) { +: Thread("TrayIcon"), windowHandle(0), server(sm), + inactiveIcon(inactiveIcon_), activeIcon(activeIcon_), + dis_inactiveIcon(dis_inactiveIcon_), dis_activeIcon(dis_activeIcon_), + menu(menu_), runTrayIcon(true) { start(); } diff --git a/win/winvnc/VNCServerWin32.cxx b/win/winvnc/VNCServerWin32.cxx index 9d77c27c..b1b9596e 100644 --- a/win/winvnc/VNCServerWin32.cxx +++ b/win/winvnc/VNCServerWin32.cxx @@ -59,8 +59,8 @@ VNCServerWin32::VNCServerWin32() CreateEvent(0, FALSE, FALSE, "Global\\SessionEventTigerVNC") : 0), vncServer(CStr(ComputerName().buf), &desktop), hostThread(0), runServer(false), isDesktopStarted(false), - httpServer(&vncServer), config(&sockMgr), trayIcon(0), - rfbSock(&sockMgr), httpSock(&sockMgr), + httpServer(&vncServer), config(&sockMgr), + rfbSock(&sockMgr), httpSock(&sockMgr), trayIcon(0), queryConnectDialog(0) { // Initialise the desktop |