Integrated fixes from 1.0 branch.

cmd/launcher/CAdvancedOptions.cpp

@@ -36,6 +36,7 @@ CAdvancedOptions::CAdvancedOptions(HWND parent, CConfig* config) :
 {
 	assert(s_singleton == NULL);
 	s_singleton = this;
+	init();
 }
 
 CAdvancedOptions::~CAdvancedOptions()
@@ -95,7 +96,7 @@ CAdvancedOptions::getCommandLine(bool isClient, const CString& serverName) const
 }
 
 void
-CAdvancedOptions::init(HWND hwnd)
+CAdvancedOptions::init()
 {
 	// get values from registry
 	HKEY key = CArchMiscWindows::openKey(HKEY_CURRENT_USER, getSettingsPath());
@@ -110,9 +111,6 @@ CAdvancedOptions::init(HWND hwnd)
 		}
 		CArchMiscWindows::closeKey(key);
 	}
-
-	// now set GUI
-	doInit(hwnd);
 }
 
 void
@@ -194,7 +192,7 @@ CAdvancedOptions::doDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM)
 {
 	switch (message) {
 	case WM_INITDIALOG:
-		init(hwnd);
+		doInit(hwnd);
 		return TRUE;
 
 	case WM_COMMAND:

cmd/launcher/CAdvancedOptions.h

@@ -54,7 +54,7 @@ public:
 	//@}
 
 private:
-	void				init(HWND hwnd);
+	void				init();
 	void				doInit(HWND hwnd);
 	bool				save(HWND hwnd);
 	void				setDefaults(HWND hwnd);

cmd/synergyc/CMSWindowsClientTaskBarReceiver.cpp

@@ -190,7 +190,7 @@ CMSWindowsClientTaskBarReceiver::copyLog() const
 		if (!data.empty()) {
 			CMSWindowsClipboard clipboard(m_window);
 			clipboard.open(0);
-			clipboard.empty();
+			clipboard.emptyUnowned();
 			clipboard.add(IClipboard::kText, data);
 			clipboard.close();
 		}

cmd/synergys/CMSWindowsServerTaskBarReceiver.cpp

@@ -210,7 +210,7 @@ CMSWindowsServerTaskBarReceiver::copyLog() const
 		if (!data.empty()) {
 			CMSWindowsClipboard clipboard(m_window);
 			clipboard.open(0);
-			clipboard.empty();
+			clipboard.emptyUnowned();
 			clipboard.add(IClipboard::kText, data);
 			clipboard.close();
 		}