1 files changed, 8 insertions, 10 deletions
diff --git a/yapp/popups2.cpp b/yapp/popups2.cpp
index 2b7cdf1..53b45e9 100644
--- a/yapp/popups2.cpp
+++ b/yapp/popups2.cpp
@@ -55,7 +55,7 @@ LIST_INTERFACE li;
 extern "C" BOOL APIENTRY DllMain( HMODULE hModule, DWORD  ul_reason_for_call, LPVOID lpReserved)
 {
 	hInst = hModule;
-	//DisableThreadLibraryCalls(hInst);
+	DisableThreadLibraryCalls(hInst);
     return TRUE;
 }
 
@@ -139,7 +139,9 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) {
 		// before the version that we use to locate it on the page
 		// (note that if the update URL and the version URL point to standard file listing entries, the backend xml
 		// data will be used to check for updates rather than the actual web page - this is not true for beta urls)
-		update.szBetaUpdateURL = "http://www.scottellis.com.au/miranda_plugins/yapp.zip";
+#ifdef _WIN64
+		update.szBetaUpdateURL = "http://www.scottellis.com.au/miranda_plugins/yapp_x64.zip";
+#endif
 		update.szBetaVersionURL = "http://www.scottellis.com.au/miranda_plugins/ver_yapp.html";
 		update.pbBetaVersionPrefix = (BYTE *)"YAPP version ";
 		
@@ -148,6 +150,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) {
 		CallService(MS_UPDATE_REGISTER, 0, (WPARAM)&update);
 	}
 
+#ifdef _UNICODE
 	if(ServiceExists(MS_FONT_REGISTERW)) 
 	{
 		font_id_firstlinew.cbSize = sizeof(FontIDW);
@@ -219,7 +222,9 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) {
 
 		hEventReloadFont = HookEvent(ME_FONT_RELOAD, ReloadFont);
 	} 
-	else if(ServiceExists(MS_FONT_REGISTER)) 
+	else 
+#endif
+		if(ServiceExists(MS_FONT_REGISTER)) 
 	{
 		font_id_firstline.cbSize = sizeof(FontID);
 		font_id_firstline.flags = FIDF_ALLOWEFFECTS;
@@ -329,13 +334,6 @@ extern "C" int POPUPS2_API Load(PLUGINLINK *link) {
 	mir_getLI(&li);
 	mir_getMMI(&mmi);
 
-	INITCOMMONCONTROLSEX icex;
-
-	// Ensure that the common control DLL is loaded (for listview)
-	icex.dwSize = sizeof(INITCOMMONCONTROLSEX);
-	icex.dwICC  = ICC_LISTVIEW_CLASSES;
-	InitCommonControlsEx(&icex); 	
-
 	InitMessagePump();
 	InitOptions();
 	InitNotify();