Don't allow update to be aborted in critical path, and fixes for updating after manually overwriting a build

2 files changed, 9 insertions, 9 deletions

diff --git a/binaryninjaapi.h b/binaryninjaapi.h
index fe4acd30..7127eda8 100644
--- a/binaryninjaapi.h
+++ b/binaryninjaapi.h
@@ -1368,9 +1368,9 @@ namespace BinaryNinja
 
 		BNUpdateResult UpdateToVersion(const std::string& version);
 		BNUpdateResult UpdateToVersion(const std::string& version,
-		                               const std::function<void(uint64_t progress, uint64_t total)>& progress);
+		                               const std::function<bool(uint64_t progress, uint64_t total)>& progress);
 		BNUpdateResult UpdateToLatestVersion();
-		BNUpdateResult UpdateToLatestVersion(const std::function<void(uint64_t progress, uint64_t total)>& progress);
+		BNUpdateResult UpdateToLatestVersion(const std::function<bool(uint64_t progress, uint64_t total)>& progress);
 	};
 
 	struct UpdateVersion
diff --git a/update.cpp b/update.cpp
index 1586c363..ca782f3e 100644
--- a/update.cpp
+++ b/update.cpp
@@ -8,12 +8,12 @@ namespace BinaryNinja
 {
 	struct UpdateProgress
 	{
-		function<void(uint64_t progress, uint64_t total)> func;
+		function<bool(uint64_t progress, uint64_t total)> func;
 
-		static void UpdateCallback(void* ctxt, uint64_t progress, uint64_t total)
+		static bool UpdateCallback(void* ctxt, uint64_t progress, uint64_t total)
 		{
 			UpdateProgress* self = (UpdateProgress*)ctxt;
-			self->func(progress, total);
+			return self->func(progress, total);
 		}
 	};
 }
@@ -65,12 +65,12 @@ bool UpdateChannel::AreUpdatesAvailable()
 
 BNUpdateResult UpdateChannel::UpdateToVersion(const string& version)
 {
-	return UpdateToVersion(version, [](uint64_t, uint64_t){});
+	return UpdateToVersion(version, [](uint64_t, uint64_t){ return true; });
 }
 
 
 BNUpdateResult UpdateChannel::UpdateToVersion(const string& version,
-                                              const function<void(uint64_t progress, uint64_t total)>& progress)
+                                              const function<bool(uint64_t progress, uint64_t total)>& progress)
 {
 	UpdateProgress up;
 	up.func = progress;
@@ -92,11 +92,11 @@ BNUpdateResult UpdateChannel::UpdateToVersion(const string& version,
 
 BNUpdateResult UpdateChannel::UpdateToLatestVersion()
 {
-	return UpdateToLatestVersion([](uint64_t, uint64_t){});
+	return UpdateToLatestVersion([](uint64_t, uint64_t){ return true; });
 }
 
 
-BNUpdateResult UpdateChannel::UpdateToLatestVersion(const function<void(uint64_t progress, uint64_t total)>& progress)
+BNUpdateResult UpdateChannel::UpdateToLatestVersion(const function<bool(uint64_t progress, uint64_t total)>& progress)
 {
 	UpdateProgress up;
 	up.func = progress;