summaryrefslogtreecommitdiff
path: root/src/installationmanager.h
diff options
context:
space:
mode:
authorTannin <devnull@localhost>2013-12-19 20:30:39 +0100
committerTannin <devnull@localhost>2013-12-19 20:30:39 +0100
commite43f126b03539c9d46e7712af9268505f256a898 (patch)
tree99503c41e07c712d3688fbebacf108beb65e88e0 /src/installationmanager.h
parent35c9fe3e98cd4a81b114b0d9acb24727465d94b3 (diff)
- bugfix: crash on overwriting a mod (introduced after the previous release)
- bugfix: ncc installer now brings the installer window to front (again? more reliably? not sure if it really worked before)
Diffstat (limited to 'src/installationmanager.h')
-rw-r--r--src/installationmanager.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/installationmanager.h b/src/installationmanager.h
index b25ea957..3478fecf 100644
--- a/src/installationmanager.h
+++ b/src/installationmanager.h
@@ -138,6 +138,7 @@ public:
/**
* @brief test if the specified mod name is free. If not, query the user how to proceed
* @param modName current possible names for the mod
+ * @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 = NULL) const;