From bbe8925378edf2acabefc33bd7a91603565e84a8 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Mon, 9 Jan 2023 20:18:53 -0800 Subject: [PATCH] run on.load_settings after loading defaults --- Manual_tests.md | 2 -- main.lua | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Manual_tests.md b/Manual_tests.md index b293f38..4f8d14e 100644 --- a/Manual_tests.md +++ b/Manual_tests.md @@ -8,8 +8,6 @@ Startup: * Initializing settings: - from previous session - - Filename as absolute path - - Filename as relative path - from defaults * How the screen looks. Our tests use a level of indirection to check text and diff --git a/main.lua b/main.lua index b846322..44181b5 100644 --- a/main.lua +++ b/main.lua @@ -78,7 +78,6 @@ function load_settings() App.screen.height = settings.height love.window.setMode(App.screen.width, App.screen.height, App.screen.flags) love.window.setPosition(settings.x, settings.y, settings.displayindex) - if on.load_settings then on.load_settings(settings.app) end else local font_height = 20 love.graphics.setFont(love.graphics.newFont(font_height)) @@ -93,6 +92,7 @@ function load_settings() App.screen.flags.minheight = math.min(App.screen.height, 200) love.window.setMode(App.screen.width, App.screen.height, App.screen.flags) end + if on.load_settings then on.load_settings(settings.app) end end function App.resize(w, h)