linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2842
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Sun 2012-01-29 17:46:13 +0100
message:
  safer splash icon size selection on < Vista
modified:
  win32/SplashWindow.cpp


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'win32/SplashWindow.cpp'
--- win32/SplashWindow.cpp	2012-01-19 17:50:37 +0000
+++ win32/SplashWindow.cpp	2012-01-29 16:46:13 +0000
@@ -31,13 +31,13 @@
 SplashWindow::SplashWindow() :
 dwt::Window(0)
 {
-	// 256x icons only work on >= Vista. on failure, let Windows choose the image size it prefers.
+	// 256x icons only work on >= Vista. on failure, try loading a 48x image.
 	try {
 		iconSize = 256;
 		icon = WinUtil::createIcon(IDI_DCPP, iconSize);
 	} catch(const dwt::DWTException&) {
-		icon = new dwt::Icon(IDI_DCPP);
-		iconSize = icon->getSize().x;
+		iconSize = 48;
+		icon = WinUtil::createIcon(IDI_DCPP, iconSize);
 	}
 
 	{