From f49a4bf4334dac4fe432cbdad3a64d2185c2b8e2 Mon Sep 17 00:00:00 2001
From: 20kdc <asdd2808@gmail.com>
Date: Mon, 23 Apr 2018 20:28:43 +0100
Subject: [PATCH] In other news, I screwed up twice in the previous commit, try
 this

---
 code/apps/sys-everest.lua | 2 +-
 code/init.lua             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/apps/sys-everest.lua b/code/apps/sys-everest.lua
index 064d8a7..d370e6d 100644
--- a/code/apps/sys-everest.lua
+++ b/code/apps/sys-everest.lua
@@ -623,7 +623,7 @@ local function startLauncher()
  if not waitingShutdownCallback then
   local lApp = "app-launcher"
   if savingThrow then
-   lApp = lApp or savingThrow.getSetting("sys-everest.launcher")
+   lApp = savingThrow.getSetting("sys-everest.launcher") or lApp
   end
   if lApp then
    neo.executeAsync(lApp)
diff --git a/code/init.lua b/code/init.lua
index d31d754..7fb1ee4 100644
--- a/code/init.lua
+++ b/code/init.lua
@@ -10,7 +10,7 @@ readBufSize = 2048
 -- A function used for logging, usable by programs.
 emergencyFunction = function (...)
  computer.pushSignal("_kosneo_syslog", "kernel", ...)
- if ocemu.log then
+ if ocemu and ocemu.log then
   pcall(ocemu.log, ...)
  end
 end