diff --git a/Makefile b/Makefile index a3bab01..26e503e 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ VERSION_MAJOR := 1 VERSION_MINOR := 0 -VERSION_REVISION := 0 +VERSION_REVISION := 1 all: mkdir -p plugin/build diff --git a/app/Makefile b/app/Makefile index a9849e7..396a523 100644 --- a/app/Makefile +++ b/app/Makefile @@ -26,7 +26,7 @@ LIBRARIES := ctru VERSION_MAJOR := 1 VERSION_MINOR := 0 -VERSION_MICRO := 0 +VERSION_MICRO := 1 BUILD_FLAGS := -march=armv6k -mtune=mpcore -mfloat-abi=hard BUILD_FLAGS_CC := -g -Wall -Wno-strict-aliasing -O3 -mword-relocations \ diff --git a/plugin/Makefile b/plugin/Makefile index 223a1b9..abc46a8 100644 --- a/plugin/Makefile +++ b/plugin/Makefile @@ -16,7 +16,7 @@ SOURCES := ArticProtocol/sources sources sources/CTRPluginFramework VERSION_MAJOR := 1 VERSION_MINOR := 0 -VERSION_REVISION := 0 +VERSION_REVISION := 1 SERVER_PORT := 5543 IP := 19 diff --git a/plugin/sources/ArticFunctions.cpp b/plugin/sources/ArticFunctions.cpp index c3e4df3..8fc39b3 100644 --- a/plugin/sources/ArticFunctions.cpp +++ b/plugin/sources/ArticFunctions.cpp @@ -29,6 +29,7 @@ namespace ArticFunctions { std::map openHandles; CTRPluginFramework::Mutex amMutex; CTRPluginFramework::Mutex cfgMutex; + bool isAzaharCalled = false; void Process_GetTitleID(ArticProtocolServer::MethodInterface& mi) { bool good = true; @@ -98,6 +99,12 @@ namespace ArticFunctions { if (good) good = mi.FinishInputParameters(); if (!good) return; + if (!isAzaharCalled) { + logger.Error("This tool cannot be used with the\n \"Connect to Artic Base\" option.\n Use \"Set Up System Files\" option."); + mi.FinishGood(-1); + return; + } + s64 out; if (R_FAILED(svcGetProcessInfo(&out, CUR_PROCESS_HANDLE, 0x10005))) { mi.FinishInternalError(); @@ -525,6 +532,7 @@ namespace ArticFunctions { return; } reinterpret_cast(ret_buf->data)[0] = INITIAL_SETUP_APP_VERSION; + isAzaharCalled = true; mi.FinishGood(0); } @@ -628,6 +636,7 @@ namespace ArticFunctions { res = FSUSER_OpenFileDirectly(&file, ARCHIVE_SDMC, fsMakePath(PATH_EMPTY, ""), fsMakePath(PATH_ASCII, filePath), FS_OPEN_READ, 0); if (R_FAILED(res)) { logger.Error("Missing OTP backup on SD card, please update your luma version and/or remove the console battery."); + logger.Error(filePath); mi.FinishGood(res); return; }