diff --git a/source/install/http_nsp.cpp b/source/install/http_nsp.cpp index 6e6f10e..9a09fb4 100755 --- a/source/install/http_nsp.cpp +++ b/source/install/http_nsp.cpp @@ -132,6 +132,7 @@ namespace tin::install::nsp inst::ui::setInstBarPerc((double)downloadProgress); //consoleUpdate(NULL); } + inst::ui::setInstBarPerc(100); u64 totalSizeMB = bufferedPlaceholderWriter.GetTotalDataSize() / 1000000; @@ -146,6 +147,7 @@ namespace tin::install::nsp inst::ui::setInstBarPerc((double)installProgress); //consoleUpdate(NULL); } + inst::ui::setInstBarPerc(100); thrd_join(curlThread, NULL); thrd_join(writeThread, NULL); diff --git a/source/install/install_nsp.cpp b/source/install/install_nsp.cpp index 43601f0..3bd3830 100755 --- a/source/install/install_nsp.cpp +++ b/source/install/install_nsp.cpp @@ -147,6 +147,7 @@ namespace tin::install::nsp fileOff += readSize; //consoleUpdate(NULL); } + inst::ui::setInstBarPerc(100); } catch (...) { diff --git a/source/netInstall.cpp b/source/netInstall.cpp index 3c242ab..c98b9fd 100755 --- a/source/netInstall.cpp +++ b/source/netInstall.cpp @@ -142,18 +142,20 @@ namespace netInstStuff{ printf("Failed to install"); printf("%s", e.what()); fprintf(stdout, "%s", e.what()); + inst::ui::setInstInfoText("Failed to install"); + inst::ui::setInstBarPerc(0); inst::ui::mainApp->CreateShowDialog("Failed to install!", "Partially installed contents can be removed from the System Settings applet.\n\n" + (std::string)e.what(), {"OK"}, true); nspInstalled = false; } printf("%s\n", "Telling the server we're done installing"); - inst::ui::setInstInfoText("Telling the server we're done installing..."); // Send 1 byte ack to close the server u8 ack = 0; tin::network::WaitSendNetworkData(m_clientSocket, &ack, sizeof(u8)); - inst::ui::setInstBarPerc(100); if(nspInstalled) { + inst::ui::setInstInfoText("Install complete"); + inst::ui::setInstBarPerc(100); if (ourUrlList.size() > 1) inst::ui::mainApp->CreateShowDialog("Selected files installed!", nspInstStuff::finishedMessage(), {"OK"}, true); else inst::ui::mainApp->CreateShowDialog(inst::util::shortenString(inst::util::formatUrlString(ourUrlList[0]), 64, true) + " installed!", nspInstStuff::finishedMessage(), {"OK"}, true); } diff --git a/source/nspInstall.cpp b/source/nspInstall.cpp index 4cc347a..ceec87c 100755 --- a/source/nspInstall.cpp +++ b/source/nspInstall.cpp @@ -127,11 +127,15 @@ namespace nspInstStuff { printf("Failed to install"); printf("%s", e.what()); fprintf(stdout, "%s", e.what()); + inst::ui::setInstInfoText("Failed to install"); + inst::ui::setInstBarPerc(0); inst::ui::mainApp->CreateShowDialog("Failed to install!", "Partially installed contents can be removed from the System Settings applet.\n\n" + (std::string)e.what(), {"OK"}, true); nspInstalled = false; } if(nspInstalled) { + inst::ui::setInstInfoText("Install complete"); + inst::ui::setInstBarPerc(100); if (ourNspList.size() > 1) { if(inst::ui::mainApp->CreateShowDialog("Selected files installed! Delete them from the SD card?", nspInstStuff::finishedMessage(), {"No","Yes"}, false) == 1) { for (long unsigned int i = 0; i < ourNspList.size(); i++) {