From 57168f2e7974a9ffae5db5e5bc5cc7ef7a2f3286 Mon Sep 17 00:00:00 2001
From: Adubbz <Adubbz@users.noreply.github.com>
Date: Fri, 1 Jun 2018 10:42:10 +1000
Subject: [PATCH] Improved ns:vm handling on unsupported firmware versions

Signed-off-by: Adubbz <Adubbz@users.noreply.github.com>
---
 nx/source/services/ns.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nx/source/services/ns.c b/nx/source/services/ns.c
index 811f62e4..9fade9fb 100644
--- a/nx/source/services/ns.c
+++ b/nx/source/services/ns.c
@@ -119,6 +119,9 @@ Result nsGetApplicationControlData(u8 flag, u64 titleID, NsApplicationControlDat
 
 Result nsvmInitialize(void)
 {
+    if (!kernelAbove300())
+        return 0;
+
     atomicIncrement64(&g_nsvmRefCnt);
 
     if (serviceIsActive(&g_nsvmSrv))
@@ -129,6 +132,9 @@ Result nsvmInitialize(void)
 
 void nsvmExit(void)
 {
+    if (!kernelAbove300())
+        return;
+
     if (atomicDecrement64(&g_nsvmRefCnt) == 0) {
         serviceClose(&g_nsvmSrv);
     }
@@ -175,6 +181,9 @@ Result nsvmNeedsUpdateVulnerability(u8 *out) {
 
 Result nsvmGetSafeSystemVersion(u16 *out)
 {
+    if (!kernelAbove300())
+        return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
+
     IpcCommand c;
     ipcInitialize(&c);