1
0
mirror of https://github.com/20kdc/OC-KittenOS.git synced 2024-11-23 10:58:06 +11:00

sys-init fix (hopefully) (presync)

This wasn't properly committed & pushed, fixed that now. Hopefully it doesn't destroy everything.
This commit is contained in:
20kdc 2021-04-26 18:06:46 +01:00
parent 6fc56b4d64
commit 85869aa80d
2 changed files with 4 additions and 3 deletions

View File

@ -32,7 +32,7 @@ return {
}, },
["neo-init"] = { ["neo-init"] = {
desc = "KittenOS NEO / sys-init (startup)", desc = "KittenOS NEO / sys-init (startup)",
v = 10, v = 11,
deps = { deps = {
"neo", "neo",
"neo-icecap", "neo-icecap",

View File

@ -16,7 +16,7 @@ neo.requestAccess("s.h._kosneo_syslog")
-- gpuG/performDisclaim are GPU management, while screen is used for prioritization -- gpuG/performDisclaim are GPU management, while screen is used for prioritization
local gpuG, performDisclaim, screen = nil local gpuG, performDisclaim, screen = nil
local scrW, scrH local scrW, scrH = 1, 1
local nssInst local nssInst
local console = {} local console = {}
@ -272,6 +272,7 @@ local function finalPrompt()
if sig[1] == "x.neo.sys.screens" then if sig[1] == "x.neo.sys.screens" then
-- We need to reinit screens no matter what. -- We need to reinit screens no matter what.
retrieveNssMonitor(screen) retrieveNssMonitor(screen)
active = false
end end
if sig[1] == "h.key_down" then if sig[1] == "h.key_down" then
if sig[2] ~= lastKeyboard then if sig[2] ~= lastKeyboard then
@ -280,7 +281,7 @@ local function finalPrompt()
if nScreen and nScreen ~= screen then if nScreen and nScreen ~= screen then
neo.emergency("new primary:", nScreen) neo.emergency("new primary:", nScreen)
retrieveNssMonitor(nScreen, screen) retrieveNssMonitor(nScreen, screen)
basicDraw() active = false
end end
end end
if sig[4] == 15 then if sig[4] == 15 then