diff options
| author | Thomas Tanner <trtanner@btinternet.com> | 2015-10-12 12:54:19 +0100 |
|---|---|---|
| committer | Thomas Tanner <trtanner@btinternet.com> | 2015-10-12 12:54:19 +0100 |
| commit | 077a58f410b4d4ef32f7a9ebc0821f08c3cec6eb (patch) | |
| tree | ba17c41455a06a74224a096544efd3c3355b3e21 /src/installationmanager.h | |
| parent | f5c86bc22c23374540d07ef63320b810c39e1df4 (diff) | |
| parent | 7d93a9a2003f31188e4da8cbcd7e5df0352bb900 (diff) | |
Merge branch 'master' of https://github.com/TanninOne/modorganizer into archive_cleanup
# Conflicts:
# src/installationmanager.cpp
Diffstat (limited to 'src/installationmanager.h')
| -rw-r--r-- | src/installationmanager.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/installationmanager.h b/src/installationmanager.h index d73f4653..5a8ec9d2 100644 --- a/src/installationmanager.h +++ b/src/installationmanager.h @@ -206,7 +206,7 @@ private: Archive *m_ArchiveHandler;
QString m_CurrentFile;
- QProgressDialog m_InstallationProgress;
+ QProgressDialog *m_InstallationProgress { nullptr };
std::set<QString> m_TempFilesToDelete;
|