Showing the changes to interface/src/Application.cpp (1 of 2 files). Show all
Unified · Split
| @@ -4091,7 +4091,7 @@ bool Application::askToUploadAsset(const QString& filename) { · 4090 unmodified lines | |||
| 4091 | // connect to the finished signal so we know when the AssetUpload is done | 4091 | // connect to the finished signal so we know when the AssetUpload is done |
| 4092 | if (messageBox.checkBox() && (messageBox.checkBox()->checkState() == Qt::Checked)) { | 4092 | if (messageBox.checkBox() && (messageBox.checkBox()->checkState() == Qt::Checked)) { |
| 4093 | // Custom behavior for models | 4093 | // Custom behavior for models |
| 4094 | QObject::connect(upload, &AssetUpload::finished, this, &Application::assetUploadFinished); | 4094 | QObject::connect(upload, &AssetUpload::finished, this, &Application::modelUploadFinished); |
| 4095 | } else { | 4095 | } else { |
| 4096 | QObject::connect(upload, &AssetUpload::finished, | 4096 | QObject::connect(upload, &AssetUpload::finished, |
| 4097 | &AssetUploadDialogFactory::getInstance(), | 4097 | &AssetUploadDialogFactory::getInstance(), |
| @@ -4108,7 +4108,7 @@ bool Application::askToUploadAsset(const QString& filename) { · 10 unmodified lines | |||
| 4108 | return false; | 4108 | return false; |
| 4109 | } | 4109 | } |
| 4110 | 4110 | ||
| 4111 | void Application::assetUploadFinished(AssetUpload* upload, const QString& hash) { | 4111 | void Application::modelUploadFinished(AssetUpload* upload, const QString& hash) { |
| 4112 | auto filename = QFileInfo(upload->getFilename()).fileName(); | 4112 | auto filename = QFileInfo(upload->getFilename()).fileName(); |
| 4113 | 4113 | ||
| 4114 | if ((upload->getError() == AssetUpload::NoError) && | 4114 | if ((upload->getError() == AssetUpload::NoError) && |