From d22bc791f4028ebc980158cc20cdc37df2f1f115 Mon Sep 17 00:00:00 2001
From: plutooo <plutooo@users.noreply.github.com>
Date: Sat, 10 Mar 2018 20:44:57 +0100
Subject: [PATCH] Nv fixes

---
 nx/source/services/nv.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/nx/source/services/nv.c b/nx/source/services/nv.c
index d5fa7c72..fefcfab1 100644
--- a/nx/source/services/nv.c
+++ b/nx/source/services/nv.c
@@ -25,10 +25,12 @@ Result nvInitialize(void)
     atomicIncrement64(&g_refCnt);
 
     if (serviceIsActive(&g_nvSrv))
-        return MAKERESULT(Module_Libnx, LibnxError_AlreadyInitialized);
+        return 0;
 
-    if (R_FAILED(appletInitialize()))
+    if (R_FAILED(appletInitialize())) {
+        atomicDecrement64(&g_refCnt);
         return MAKERESULT(Module_Libnx, LibnxError_AppletFailedToInitialize);
+    }
 
     Result rc = 0;
     u64 AppletResourceUserId = 0;
@@ -78,9 +80,9 @@ Result nvInitialize(void)
 void nvExit(void)
 {
     if (atomicDecrement64(&g_refCnt) == 0) {
-        appletExit();
         serviceClose(&g_nvSrv);
         tmemClose(&g_nvTransfermem);
+        appletExit();
     }
 }