From 23eab916aeefb773409d2c9dcb3ea2cd2ee1bda9 Mon Sep 17 00:00:00 2001 From: Chris Bessent Date: Sun, 6 Sep 2020 06:57:05 -0700 Subject: Do not report a canceled install as failed When a mod install reached the point of checking for overwrites with existing mods (i.e., new mod has the same name as an old mod), there was no way to distinguish between a failure and a user cancellation. Now, an explicit status is passed up the stack so the cancellation can be safely ignored by error checking code. --- src/installationmanager.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/installationmanager.h') diff --git a/src/installationmanager.h b/src/installationmanager.h index b3a7362f..63e8794e 100644 --- a/src/installationmanager.h +++ b/src/installationmanager.h @@ -185,7 +185,7 @@ public: * @param merge if this value is not null, the value will be set to whether the use chose to merge or replace * @return true if we can proceed with the installation, false if the user canceled or in case of an unrecoverable error */ - virtual bool testOverwrite(MOBase::GuessedValue &modName, bool *merge = nullptr); + virtual MOBase::IPluginInstaller::EInstallResult testOverwrite(MOBase::GuessedValue &modName, bool *merge = nullptr); QString generateBackupName(const QString &directoryName) const; -- cgit v1.3.1