Parcourir la source

Merge pull request #2147 from Papaew/window_icon_fix

Fixed delay in changing window icon on boot
Sasha Szpakowski il y a 7 mois
Parent
commit
8ec5898f9c
1 fichiers modifiés avec 5 ajouts et 4 suppressions
  1. 5 4
      src/modules/love/boot.lua

+ 5 - 4
src/modules/love/boot.lua

@@ -383,6 +383,11 @@ function love.init()
 
 	-- Setup window here.
 	if c.window and c.modules.window then
+		if c.window.icon then
+			assert(love.image, "If an icon is set in love.conf, love.image must be loaded.")
+			love.window.setIcon(love.image.newImageData(c.window.icon))
+		end
+
 		love.window.setTitle(c.window.title or c.title)
 		assert(love.window.setMode(c.window.width, c.window.height,
 		{
@@ -404,10 +409,6 @@ function love.init()
 			x = c.window.x,
 			y = c.window.y,
 		}), "Could not set window mode")
-		if c.window.icon then
-			assert(love.image, "If an icon is set in love.conf, love.image must be loaded.")
-			love.window.setIcon(love.image.newImageData(c.window.icon))
-		end
 	end
 
 	-- The first couple event pumps on some systems (e.g. macOS) can take a