summaryrefslogtreecommitdiff
path: root/src/installationmanager.h
diff options
context:
space:
mode:
authorChris Bessent <lost.dragonist@gmail.com>2020-09-07 17:56:37 -0700
committerGitHub <noreply@github.com>2020-09-07 17:56:37 -0700
commit504683776c51253fbd2b922a269b09177944d031 (patch)
treebbc50427d1cbe3ceb9c6a8c52cac88e965241250 /src/installationmanager.h
parent2ad41ee2cd94f5012140989f9ddc553459fc5214 (diff)
parent23eab916aeefb773409d2c9dcb3ea2cd2ee1bda9 (diff)
Merge pull request #1227 from LostDragonist/master
Do not report a canceled install as failed
Diffstat (limited to 'src/installationmanager.h')
-rw-r--r--src/installationmanager.h2
1 files changed, 1 insertions, 1 deletions
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<QString> &modName, bool *merge = nullptr);
+ virtual MOBase::IPluginInstaller::EInstallResult testOverwrite(MOBase::GuessedValue<QString> &modName, bool *merge = nullptr);
QString generateBackupName(const QString &directoryName) const;