Moved amapp init into a seperate function.

diff --git a/libctru/include/3ds/services/am.h b/libctru/include/3ds/services/am.h
index dc301b108e1feceb544153ad510a293cd815850b..d02650bb74c76126ad13faa8803e15a26844693c 100644 (file)
--- a/libctru/include/3ds/services/am.h
+++ b/libctru/include/3ds/services/am.h
@@ -56,9 +56,12 @@ typedef struct {
        u64 titlesFreeSpace; ///< Free space for titles.
 } AM_TWLPartitionInfo;
 
-/// Initializes AM.
+/// Initializes AM. This doesn't initialize with "am:app", see amAppInit().
 Result amInit(void);
 
+/// Initializes AM with a service which has access to the amapp-commands. This should only be used when using the amapp commands, not non-amapp AM commands.
+Result amAppInit(void);
+
 /// Exits AM.
 void amExit(void);
 

diff --git a/libctru/source/services/am.c b/libctru/source/services/am.c
index 6e3f45290f0f6e0e01a2e2e1745c269f9bb347f9..cc51e259c6ea3cf5d8d06c10a484c9f6a31b47b5 100644 (file)
--- a/libctru/source/services/am.c
+++ b/libctru/source/services/am.c
@@ -20,6 +20,18 @@ Result amInit(void)
        ret = srvGetServiceHandle(&amHandle, "am:net");
        if (R_FAILED(ret)) ret = srvGetServiceHandle(&amHandle, "am:u");
        if (R_FAILED(ret)) ret = srvGetServiceHandle(&amHandle, "am:sys");
+       if (R_FAILED(ret)) AtomicDecrement(&amRefCount);
+
+       return ret;
+}
+
+Result amAppInit(void)
+{
+       Result ret;
+
+       if (AtomicPostIncrement(&amRefCount)) return 0;
+
+       ret = srvGetServiceHandle(&amHandle, "am:sys");
        if (R_FAILED(ret)) ret = srvGetServiceHandle(&amHandle, "am:app");
        if (R_FAILED(ret)) AtomicDecrement(&amRefCount);